Skip to content

Commit cf081f1

Browse files
author
Marcin Przepiorowski
committed
2.4.24.2
2 parents 037e0ac + 03ea793 commit cf081f1

File tree

6 files changed

+235
-26
lines changed

6 files changed

+235
-26
lines changed

‎.github/workflows/build.yml‎

Lines changed: 80 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
mv dxtoolkit.tar.gz ${{ env.FILENAME }}
4646
4747
- name: Upload centos 7
48-
uses: actions/upload-artifact@v1
48+
uses: actions/upload-artifact@v4
4949
with:
5050
name: cento7build
5151
path: ${{ env.FILENAME }}
@@ -119,7 +119,7 @@ jobs:
119119
mv dxtoolkit.tar.gz ${{ env.FILENAME }}
120120
121121
- name: Upload ubuntu
122-
uses: actions/upload-artifact@v1
122+
uses: actions/upload-artifact@v4
123123
with:
124124
name: ubuntubuild
125125
path: ${{ env.FILENAME }}
@@ -165,7 +165,7 @@ jobs:
165165
mv dxtoolkit.tar.gz ${{ env.FILENAME }}
166166
167167
- name: Upload centos 6
168-
uses: actions/upload-artifact@v1
168+
uses: actions/upload-artifact@v4
169169
with:
170170
name: cento6build
171171
path: ${{ env.FILENAME }}
@@ -216,7 +216,7 @@ jobs:
216216
mv dxtoolkit.tar.gz ${{ env.FILENAME }}
217217
218218
- name: Upload oel 8
219-
uses: actions/upload-artifact@v1
219+
uses: actions/upload-artifact@v4
220220
with:
221221
name: oel8build
222222
path: ${{ env.FILENAME }}
@@ -278,7 +278,7 @@ jobs:
278278
shell: powershell
279279

280280
- name: Upload windows
281-
uses: actions/upload-artifact@v1
281+
uses: actions/upload-artifact@v4
282282
with:
283283
name: windowsbuild
284284
path: ${{ env.FILENAME }}
@@ -386,7 +386,7 @@ jobs:
386386
tar czvf ${{ env.FILENAME }} dxtoolkit2/
387387
388388
- name: Upload OSX
389-
uses: actions/upload-artifact@v1
389+
uses: actions/upload-artifact@v4
390390
with:
391391
name: osxbuild
392392
path: ${{ env.FILENAME }}
@@ -493,11 +493,68 @@ jobs:
493493
tar czvf ${{ env.FILENAME }} dxtoolkit2/
494494
495495
- name: Upload OSX
496-
uses: actions/upload-artifact@v1
496+
uses: actions/upload-artifact@v4
497497
with:
498498
name: osxbuild
499499
path: ${{ env.FILENAME }}
500500

501+
ubuntu22:
502+
needs: [centos7]
503+
runs-on: ubuntu-latest
504+
505+
steps:
506+
- name: checkout dxtoolkit code
507+
uses: actions/checkout@master
508+
509+
- name: add version
510+
run: |
511+
mkdir dxtoolkit2
512+
chmod 777 dxtoolkit2
513+
cd ./lib
514+
mv Toolkit_helpers.pm Toolkit_helpers.orig.pm
515+
cat Toolkit_helpers.orig.pm | sed -r -e "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+\.?[[:digit:]]?)/\1-dev-${GITHUB_SHA}/" > Toolkit_helpers.pm
516+
grep "version" Toolkit_helpers.pm
517+
518+
- name: Set up a Perl container
519+
#uses: pioro/dxtoolkit@develop
520+
uses: docker://pioro/dxperlubuntu22:526
521+
with:
522+
ENCKEY: ${{ secrets.ENCKEY }}
523+
524+
- name: Get the version
525+
id: get_version
526+
run: |
527+
if (echo ${GITHUB_REF} | grep "/tags/" > /dev/null); then
528+
SOURCE_TAG=${GITHUB_REF#refs/tags/}
529+
elif (echo ${GITHUB_REF} | grep "/heads/" > /dev/null); then
530+
SOURCE_TAG=${GITHUB_REF#refs/heads/}
531+
else
532+
exit 1
533+
fi
534+
FILENAME="dxtoolkit2-${SOURCE_TAG}-ubuntu2204-installer.tar.gz"
535+
echo SOURCE_TAG=$SOURCE_TAG >> $GITHUB_ENV
536+
echo FILENAME=$FILENAME >> $GITHUB_ENV
537+
538+
- name: add examples
539+
run: |
540+
gzip -d dxtoolkit.tar.gz
541+
cp bin/dxtools.conf.example dxtoolkit2/dxtools.conf.example
542+
cp bin/dxusers.csv.example dxtoolkit2/dxusers.csv.example
543+
tar -rvf dxtoolkit.tar dxtoolkit2/dxtools.conf.example dxtoolkit2/dxusers.csv.example
544+
gzip dxtoolkit.tar
545+
546+
- name: compress toolkit
547+
run: |
548+
mv dxtoolkit.tar.gz ${{ env.FILENAME }}
549+
550+
- name: Upload ubuntu
551+
uses: actions/upload-artifact@v4
552+
with:
553+
name: ubuntu22build
554+
path: ${{ env.FILENAME }}
555+
556+
557+
501558

502559
amazon2023:
503560
needs: [centos7]
@@ -550,7 +607,7 @@ jobs:
550607
mv dxtoolkit.tar.gz ${{ env.FILENAME }}
551608
552609
- name: Upload amazon 2023
553-
uses: actions/upload-artifact@v1
610+
uses: actions/upload-artifact@v4
554611
with:
555612
name: amazon2023
556613
path: ${{ env.FILENAME }}
@@ -564,41 +621,46 @@ jobs:
564621
steps:
565622

566623
- name: Download centos7
567-
uses: actions/download-artifact@v1
624+
uses: actions/download-artifact@v4
568625
with:
569626
name: cento7build
570627

571628
- name: Download centos6
572-
uses: actions/download-artifact@v1
629+
uses: actions/download-artifact@v4
573630
with:
574631
name: cento6build
575632

576633
- name: Download windows
577-
uses: actions/download-artifact@v1
634+
uses: actions/download-artifact@v4
578635
with:
579636
name: windowsbuild
580637

581638
- name: Download ubuntu
582-
uses: actions/download-artifact@v1
639+
uses: actions/download-artifact@v4
583640
with:
584641
name: ubuntubuild
585642

586643
- name: Download osx
587-
uses: actions/download-artifact@v1
644+
uses: actions/download-artifact@v4
588645
with:
589646
name: osxbuild
590647

591648

592649
- name: Download OEL8
593-
uses: actions/download-artifact@v1
650+
uses: actions/download-artifact@v4
594651
with:
595652
name: oel8build
596653

597654
- name: Download Amazon 2023
598-
uses: actions/download-artifact@v1
655+
uses: actions/download-artifact@v4
599656
with:
600657
name: amazon2023
601658

659+
- name: Download Amazon 2023
660+
uses: actions/download-artifact@v4
661+
with:
662+
name: ubuntu22build
663+
602664
- name: Say
603665
run: |
604666
echo "HELLO"
@@ -616,6 +678,7 @@ jobs:
616678
FILENAMEWIN="dxtoolkit2-${SOURCE_TAG}-win64-installer.zip"
617679
FILENAMEOSX="dxtoolkit2-${SOURCE_TAG}-osx.tar.gz"
618680
FILENAMEAMZ="dxtoolkit2-${SOURCE_TAG}-amazon2023-installer.tar.gz"
681+
FILENAMEUBUNTU22="dxtoolkit2-${SOURCE_TAG}-ubuntu2204-installer.tar.gz"
619682
620683
echo SOURCE_TAG=$SOURCE_TAG >> $GITHUB_ENV
621684
echo FILENAMERH7=$FILENAMERH7 >> $GITHUB_ENV
@@ -625,6 +688,7 @@ jobs:
625688
echo FILENAMEWIN=$FILENAMEWIN >> $GITHUB_ENV
626689
echo FILENAMEOSX=$FILENAMEOSX >> $GITHUB_ENV
627690
echo FILENAMEAMZ=$FILENAMEAMZ >> $GITHUB_ENV
691+
echo FILENAMEUBUNTU22=$FILENAMEUBUNTU22 >> $GITHUB_ENV
628692
629693
- name: Create Release
630694
id: create_release
@@ -634,5 +698,5 @@ jobs:
634698
name: Release ${{ env.SOURCE_TAG }}
635699
draft: true
636700
prerelease: true
637-
artifacts: "cento7build/${{ env.FILENAMERH7 }},cento6build/${{ env.FILENAMERH6 }},oel8build/${{ env.FILENAMERH8 }},ubuntubuild/${{ env.FILENAMEUBUNTU }},windowsbuild/${{ env.FILENAMEWIN }},osxbuild/${{ env.FILENAMEOSX }},amazon2023/${{ env.FILENAMEAMZ }}"
701+
artifacts: "cento7build/${{ env.FILENAMERH7 }},cento6build/${{ env.FILENAMERH6 }},oel8build/${{ env.FILENAMERH8 }},ubuntubuild/${{ env.FILENAMEUBUNTU }},windowsbuild/${{ env.FILENAMEWIN }},osxbuild/${{ env.FILENAMEOSX }},amazon2023/${{ env.FILENAMEAMZ }},cento7build/${{ env.FILENAMEUBUNTU22 }}"
638702
tag: ${{ env.SOURCE_TAG }}

‎.github/workflows/develop.yml‎

Lines changed: 67 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
mv dxtoolkit.tar.gz ${{ env.FILENAME }}
5858
5959
- name: Upload centos 7
60-
uses: actions/upload-artifact@v1
60+
uses: actions/upload-artifact@v4
6161
with:
6262
name: cento7build
6363
path: ${{ env.FILENAME }}
@@ -152,11 +152,69 @@ jobs:
152152
mv dxtoolkit.tar.gz ${{ env.FILENAME }}
153153
154154
- name: Upload ubuntu
155-
uses: actions/upload-artifact@v1
155+
uses: actions/upload-artifact@v4
156156
with:
157157
name: ubuntubuild
158158
path: ${{ env.FILENAME }}
159159

160+
161+
ubuntu22:
162+
needs: [centos7]
163+
runs-on: ubuntu-latest
164+
165+
steps:
166+
- name: checkout dxtoolkit code
167+
uses: actions/checkout@master
168+
169+
- name: add version
170+
run: |
171+
mkdir dxtoolkit2
172+
chmod 777 dxtoolkit2
173+
cd ./lib
174+
mv Toolkit_helpers.pm Toolkit_helpers.orig.pm
175+
cat Toolkit_helpers.orig.pm | sed -r -e "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+\.?[[:digit:]]?)/\1-dev-${GITHUB_SHA}/" > Toolkit_helpers.pm
176+
grep "version" Toolkit_helpers.pm
177+
178+
- name: Set up a Perl container
179+
#uses: pioro/dxtoolkit@develop
180+
uses: docker://pioro/dxperlubuntu22:526
181+
with:
182+
ENCKEY: ${{ secrets.ENCKEY }}
183+
184+
- name: Get the version
185+
id: get_version
186+
run: |
187+
if (echo ${GITHUB_REF} | grep "/tags/" > /dev/null); then
188+
SOURCE_TAG=${GITHUB_REF#refs/tags/}
189+
elif (echo ${GITHUB_REF} | grep "/heads/" > /dev/null); then
190+
SOURCE_TAG=${GITHUB_REF#refs/heads/}
191+
else
192+
exit 1
193+
fi
194+
FILENAME="dxtoolkit2-${SOURCE_TAG}-ubuntu2204-installer.tar.gz"
195+
echo SOURCE_TAG=$SOURCE_TAG >> $GITHUB_ENV
196+
echo FILENAME=$FILENAME >> $GITHUB_ENV
197+
198+
- name: add examples
199+
run: |
200+
gzip -d dxtoolkit.tar.gz
201+
cp bin/dxtools.conf.example dxtoolkit2/dxtools.conf.example
202+
cp bin/dxusers.csv.example dxtoolkit2/dxusers.csv.example
203+
tar -rvf dxtoolkit.tar dxtoolkit2/dxtools.conf.example dxtoolkit2/dxusers.csv.example
204+
gzip dxtoolkit.tar
205+
206+
- name: compress toolkit
207+
run: |
208+
mv dxtoolkit.tar.gz ${{ env.FILENAME }}
209+
210+
- name: Upload ubuntu
211+
uses: actions/upload-artifact@v4
212+
with:
213+
name: ubuntu22build
214+
path: ${{ env.FILENAME }}
215+
216+
217+
160218
centos6:
161219
needs: [centos7]
162220
runs-on: ubuntu-latest
@@ -207,7 +265,7 @@ jobs:
207265
mv dxtoolkit.tar.gz ${{ env.FILENAME }}
208266
209267
- name: Upload centos 6
210-
uses: actions/upload-artifact@v1
268+
uses: actions/upload-artifact@v4
211269
with:
212270
name: cento6build
213271
path: ${{ env.FILENAME }}
@@ -263,7 +321,7 @@ jobs:
263321
mv dxtoolkit.tar.gz ${{ env.FILENAME }}
264322
265323
- name: Upload oel 8
266-
uses: actions/upload-artifact@v1
324+
uses: actions/upload-artifact@v4
267325
with:
268326
name: oel8build
269327
path: ${{ env.FILENAME }}
@@ -310,7 +368,7 @@ jobs:
310368
shell: powershell
311369

312370
# - name: Upload enc
313-
# uses: actions/upload-artifact@v1
371+
# uses: actions/upload-artifact@v4
314372
# with:
315373
# name: windowsbuild-enc
316374
# path: D:\a\dxtoolkit\dxtoolkit\lib\dbutils.pm
@@ -343,7 +401,7 @@ jobs:
343401
shell: powershell
344402

345403
- name: Upload windows
346-
uses: actions/upload-artifact@v1
404+
uses: actions/upload-artifact@v4
347405
with:
348406
name: windowsbuild
349407
path: ${{ env.FILENAME }}
@@ -471,7 +529,7 @@ jobs:
471529
tar czvf ${{ env.FILENAME }} dxtoolkit2/
472530
473531
- name: Upload OSX
474-
uses: actions/upload-artifact@v1
532+
uses: actions/upload-artifact@v4
475533
with:
476534
name: osxbuild
477535
path: ${{ env.FILENAME }}
@@ -598,7 +656,7 @@ jobs:
598656
tar czvf ${{ env.FILENAME }} dxtoolkit2/
599657
600658
- name: Upload OSX
601-
uses: actions/upload-artifact@v1
659+
uses: actions/upload-artifact@v4
602660
with:
603661
name: osxbuild
604662
path: ${{ env.FILENAME }}
@@ -656,7 +714,7 @@ jobs:
656714
mv dxtoolkit.tar.gz ${{ env.FILENAME }}
657715
658716
- name: Upload amazon 2023
659-
uses: actions/upload-artifact@v1
717+
uses: actions/upload-artifact@v4
660718
with:
661719
name: amazon2023
662720
path: ${{ env.FILENAME }}

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 2.4.24.2
2+
3+
### Added
4+
- Ubuntu 22 build
5+
16
## 2.4.24.1
27

38
### Changes

‎build/ubuntu22/Dockerfile‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
FROM ubuntu:22.04
2+
3+
RUN apt-get update \
4+
&& apt-get install -y libpar-packer-perl \
5+
&& apt-get install -y libjson-pp-perl \
6+
&& apt-get install -y libdate-manip-perl \
7+
&& apt-get install -y libdatetime-format-dateparse-perl \
8+
&& apt-get install -y libcrypt-cbc-perl \
9+
&& apt-get install -y libcrypt-blowfish-perl \
10+
&& apt-get install -y libtext-csv-perl \
11+
&& apt-get install -y libtry-tiny-perl \
12+
&& apt-get install -y libparse-http-useragent-perl \
13+
&& apt-get install -y libnet-ssleay-perl \
14+
&& apt-get install -y libio-socket-ssl-perl \
15+
&& apt-get install -y libfilter-perl \
16+
&& apt-get install -y libterm-readkey-perl \
17+
&& apt-get install -y cpanminus \
18+
&& apt-get install -y make \
19+
&& apt-get install -y gcc \
20+
&& apt-get install -y libssl-dev \
21+
&& apt-get install -y libwww-perl \
22+
&& cpanm DateTime::Event::Cron::Quartz \
23+
&& cpanm Log::Syslog::Fast@0.65 \
24+
&& cpanm Filter::Crypto::Decrypt
25+
26+
RUN mkdir -p /github/workspace
27+
RUN mkdir -p /github/home
28+
RUN mkdir -p /github/workflow
29+
COPY entrypoint.sh /entrypoint.sh
30+
WORKDIR /github/workspace
31+
RUN chmod +x /entrypoint.sh
32+
33+
34+
ENTRYPOINT ["/entrypoint.sh"]
35+
36+
37+

0 commit comments

Comments
 (0)