Skip to content

Commit 0f8be40

Browse files
author
Marcin Przepiorowski
committed
version 2.4.18
2 parents 4ce0821 + 756329a commit 0f8be40

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+888
-445
lines changed

.github/workflows/develop.yml

Lines changed: 69 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ jobs:
1313
- name: checkout dxtoolkit code
1414
uses: actions/checkout@master
1515

16+
- name: add version
17+
run: |
18+
mkdir dxtoolkit2
19+
chmod 777 dxtoolkit2
20+
cd ./lib
21+
mv Toolkit_helpers.pm Toolkit_helpers.orig.pm
22+
cat Toolkit_helpers.orig.pm | sed -r -e "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+\.?[[:digit:]]?)/\1-dev-${GITHUB_SHA}/" > Toolkit_helpers.pm
23+
grep "version" Toolkit_helpers.pm
24+
1625
- name: Set up a Perl container
1726
#uses: pioro/dxtoolkit@develop
1827
uses: docker://pioro/dxperlcent7:5.26
@@ -35,8 +44,10 @@ jobs:
3544
3645
- name: add examples
3746
run: |
47+
ls -l
3848
gzip -d dxtoolkit.tar.gz
39-
tar -rvf dxtoolkit.tar bin/dxtools.conf.example bin/dxusers.csv.example
49+
cp bin/dxtools.conf.example bin/dxusers.csv.example dxtoolkit2
50+
tar -rvf dxtoolkit.tar dxtoolkit2/dxtools.conf.example dxtoolkit2/dxusers.csv.example
4051
gzip dxtoolkit.tar
4152
4253
@@ -55,24 +66,34 @@ jobs:
5566
runs-on: ubuntu-latest
5667
steps:
5768
- name: Checkout
58-
uses: actions/checkout@v2
69+
uses: actions/checkout@master
70+
71+
- name: add version
72+
run: |
73+
mkdir dxtoolkit2
74+
chmod 777 dxtoolkit2
75+
cd ./lib
76+
mv Toolkit_helpers.pm Toolkit_helpers.orig.pm
77+
cat Toolkit_helpers.orig.pm | sed -r -e "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+\.?[[:digit:]]?)/\1-dev-${GITHUB_SHA}/" > Toolkit_helpers.pm
78+
grep "version" Toolkit_helpers.pm
79+
5980
- name: Docker meta
6081
id: meta
61-
uses: docker/metadata-action@v3
82+
uses: docker/metadata-action@master
6283
with:
6384
images: pioro/dxtoolkit
6485
- name: Set up QEMU
65-
uses: docker/setup-qemu-action@v1
86+
uses: docker/setup-qemu-action@master
6687
- name: Set up Docker Buildx
67-
uses: docker/setup-buildx-action@v1
88+
uses: docker/setup-buildx-action@master
6889
- name: Login to DockerHub
69-
uses: docker/login-action@v1
90+
uses: docker/login-action@master
7091
with:
7192
username: ${{ secrets.DOCKERHUB_USERNAME }}
7293
password: ${{ secrets.DOCKERHUB_TOKEN }}
7394
- name: Build and push
7495
id: docker_build
75-
uses: docker/build-push-action@v2
96+
uses: docker/build-push-action@master
7697
with:
7798
context: docker/
7899
push: true
@@ -88,6 +109,14 @@ jobs:
88109
- name: checkout dxtoolkit code
89110
uses: actions/checkout@master
90111

112+
- name: add version
113+
run: |
114+
mkdir dxtoolkit2
115+
chmod 777 dxtoolkit2
116+
cd ./lib
117+
mv Toolkit_helpers.pm Toolkit_helpers.orig.pm
118+
cat Toolkit_helpers.orig.pm | sed -r -e "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+\.?[[:digit:]]?)/\1-dev-${GITHUB_SHA}/" > Toolkit_helpers.pm
119+
grep "version" Toolkit_helpers.pm
91120
92121
- name: Set up a Perl container
93122
#uses: pioro/dxtoolkit@develop
@@ -112,7 +141,8 @@ jobs:
112141
- name: add examples
113142
run: |
114143
gzip -d dxtoolkit.tar.gz
115-
tar -rvf dxtoolkit.tar bin/dxtools.conf.example bin/dxusers.csv.example
144+
cp bin/dxtools.conf.example bin/dxusers.csv.example dxtoolkit2
145+
tar -rvf dxtoolkit.tar dxtoolkit2/dxtools.conf.example dxtoolkit2/dxusers.csv.example
116146
gzip dxtoolkit.tar
117147
118148
- name: compress toolkit
@@ -133,6 +163,15 @@ jobs:
133163
- name: checkout dxtoolkit code
134164
uses: actions/checkout@master
135165

166+
- name: add version
167+
run: |
168+
mkdir dxtoolkit2
169+
chmod 777 dxtoolkit2
170+
cd ./lib
171+
mv Toolkit_helpers.pm Toolkit_helpers.orig.pm
172+
cat Toolkit_helpers.orig.pm | sed -r -e "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+\.?[[:digit:]]?)/\1-dev-${GITHUB_SHA}/" > Toolkit_helpers.pm
173+
grep "version" Toolkit_helpers.pm
174+
136175
- name: Set up a Perl container
137176
#uses: pioro/dxtoolkit@develop
138177
uses: docker://pioro/dxperlcent6:5.26
@@ -156,7 +195,8 @@ jobs:
156195
- name: add examples
157196
run: |
158197
gzip -d dxtoolkit.tar.gz
159-
tar -rvf dxtoolkit.tar bin/dxtools.conf.example bin/dxusers.csv.example
198+
cp bin/dxtools.conf.example bin/dxusers.csv.example dxtoolkit2
199+
tar -rvf dxtoolkit.tar dxtoolkit2/dxtools.conf.example dxtoolkit2/dxusers.csv.example
160200
gzip dxtoolkit.tar
161201
162202
- name: compress toolkit
@@ -178,6 +218,15 @@ jobs:
178218
- name: checkout dxtoolkit code
179219
uses: actions/checkout@master
180220

221+
- name: add version
222+
run: |
223+
mkdir dxtoolkit2
224+
chmod 777 dxtoolkit2
225+
cd ./lib
226+
mv Toolkit_helpers.pm Toolkit_helpers.orig.pm
227+
cat Toolkit_helpers.orig.pm | sed -r -e "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+\.?[[:digit:]]?)/\1-dev-${GITHUB_SHA}/" > Toolkit_helpers.pm
228+
grep "version" Toolkit_helpers.pm
229+
181230
- name: Set up a Perl container
182231
#uses: pioro/dxtoolkit@develop
183232
uses: docker://pioro/dxperloel8:5.26
@@ -201,7 +250,8 @@ jobs:
201250
- name: add examples
202251
run: |
203252
gzip -d dxtoolkit.tar.gz
204-
tar -rvf dxtoolkit.tar bin/dxtools.conf.example bin/dxusers.csv.example
253+
cp bin/dxtools.conf.example bin/dxusers.csv.example dxtoolkit2
254+
tar -rvf dxtoolkit.tar dxtoolkit2/dxtools.conf.example dxtoolkit2/dxusers.csv.example
205255
gzip dxtoolkit.tar
206256
207257
- name: compress toolkit
@@ -246,6 +296,12 @@ jobs:
246296
mv dbutils.pm dbutils.orig.pm
247297
$raw = (Get-Content -path .\dbutils.orig.pm -Raw) -replace 'put your encryption key here','${{ secrets.ENCKEY_WINDOWS }}'
248298
Set-Content -Path .\dbutils.pm -Value $raw
299+
300+
301+
mv Toolkit_helpers.pm Toolkit_helpers.orig.pm
302+
$raw = Get-Content -path .\Toolkit_helpers.orig.pm -Raw | % { $_ -replace "(version.*?\d+\.\d+\.\d+\.?\d?)","`$1-dev-${env:GITHUB_SHA}" }
303+
Set-Content -Path .\Toolkit_helpers.pm -Value $raw
304+
249305
cd D:\a\dxtoolkit\dxtoolkit\
250306
shell: powershell
251307

@@ -368,6 +424,9 @@ jobs:
368424
cd ./lib
369425
mv dbutils.pm dbutils.orig.pm
370426
cat dbutils.orig.pm | sed -e "s/put your encryption key here/${{ secrets.ENCKEY }}/" > dbutils.pm
427+
mv Toolkit_helpers.pm Toolkit_helpers.orig.pm
428+
cat Toolkit_helpers.orig.pm | sed -r -e "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+\.?[[:digit:]]?)/\1-dev-${GITHUB_SHA}/" > Toolkit_helpers.pm
429+
grep "version" Toolkit_helpers.pm
371430
cd ../bin
372431
$PP -u -I ../lib ${LIBS} -M Text::CSV_PP -M List::MoreUtils::PP -M Crypt::Blowfish \
373432
-F Crypto=dbutils\.pm$ -M Filter::Crypto::Decrypt -o ../dxtoolkit2/runner `ls dx_*.pl | xargs`

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,9 @@
22
tools/*
33
bin/dxtools.conf
44
test/debug*
5+
test/test_database_list/*.dbhooks
6+
.vscode
7+
bin/debug*
8+
*.conf
9+
# test file
10+
bin/a.pl

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
## 2.4.18
2+
3+
### Added
4+
- [bug #206](https://github.com/delphix/dxtoolkit/issues/206) - dsource hooks support
5+
- [bug #217](https://github.com/delphix/dxtoolkit/issues/217) - dx_ctl_namespace added with option to failover and delete a namespace
6+
- [bug #220](https://github.com/delphix/dxtoolkit/issues/220) - Support for different metrics - MB/TB/GB/KB added to commands displaying space
7+
8+
9+
10+
### Changes:
11+
- [bug #223](https://github.com/delphix/dxtoolkit/issues/223) - dx_ctl_js_container fix with return code
12+
- [bug #222](https://github.com/delphix/dxtoolkit/issues/222) - db_get_db_env backup is now generating proper output for masked child VDB
13+
- [bug #221](https://github.com/delphix/dxtoolkit/issues/221) - dbname for Oracle PDB can be now up to 30 characters
14+
- build fixes
15+
16+
17+
118
## 2.4.17.2
219

320
### Changes:

0 commit comments

Comments
 (0)