@@ -11,19 +11,22 @@ jobs:
1111 runs-on : ubuntu-latest
1212 steps :
1313 - name : Downlaod source code
14- run : wget https://physics.princeton.edu/pulsar/k1jt/ wsjtx-2.5.4 .tgz
14+ run : wget https://wsjt.sourceforge.io/downloads/ wsjtx-2.6.1 .tgz
1515
1616 - name : Save WSJTX for next jobs
1717 uses : actions/upload-artifact@v2
1818 with :
1919 name : wsjtx-source-code
20- path : wsjtx-2.5.4.tgz
21-
20+ path : wsjtx-2.6.1.tgz
2221
2322 patch_source :
2423 needs : ['download_wsjtx']
2524 runs-on : ubuntu-latest
2625 steps :
26+ - name : cleanup # https://github.com/actions/checkout/issues/211
27+ run : |
28+ sudo chown -R $USER:$USER $GITHUB_WORKSPACE
29+
2730 - name : Get source code
2831 uses : actions/checkout@v2
2932
@@ -33,10 +36,10 @@ jobs:
3336 name : wsjtx-source-code
3437
3538 - name : Unpack the source
36- run : mkdir unpack && pwd && ls -l && tar -xzvf wsjtx-2.5.4 .tgz -C unpack/
39+ run : mkdir unpack && pwd && ls -l && tar -xzvf wsjtx-2.6.1 .tgz -C unpack/
3740
3841 - name : Prepare source
39- run : mkdir newsrc && tar -xzvf unpack/wsjtx-2.5.4 /src/wsjtx.tgz -C newsrc/
42+ run : mkdir newsrc && tar -xzvf unpack/wsjtx-2.6.1 /src/wsjtx.tgz -C newsrc/
4043
4144 - name : Patch WSJTX
4245 run : cp -R patch/* newsrc/wsjtx/
@@ -45,50 +48,23 @@ jobs:
4548 run : cd newsrc/ && tar -czvf wsjtx.tgz * && cd ..
4649
4750 - name : Copy package
48- run : cp newsrc/wsjtx.tgz unpack/wsjtx-2.5.4 /src/
51+ run : cp newsrc/wsjtx.tgz unpack/wsjtx-2.6.1 /src/
4952
5053 - name : Generate md5sum
51- run : cd unpack/wsjtx-2.5.4 /src/ && md5sum wsjtx.tgz > wsjtx.tgz.md5sum
54+ run : cd unpack/wsjtx-2.6.1 /src/ && md5sum wsjtx.tgz > wsjtx.tgz.md5sum
5255
5356 - name : Create new archive
54- run : cd unpack/ && tar -czvf wsjtx-patched-2.5.4 .tgz *
57+ run : cd unpack/ && tar -czvf wsjtx-patched-2.6.1 .tgz *
5558
5659 - name : Upload new patched archive
5760 uses : actions/upload-artifact@v2
5861 with :
5962 name : wsjtx-patched-code
60- path : unpack/wsjtx-patched-2.5.4.tgz
61-
62- build_rpi32 :
63- needs : ['patch_source']
64- runs-on : ARM
65- steps :
66- - name : Get source code
67- uses : actions/checkout@v2
68-
69- - name : Download artifacts
70- uses : actions/download-artifact@v2
71- with :
72- name : wsjtx-patched-code
73-
74- - name : Prepare environment
75- run : tar -xzvf wsjtx-patched-2.5.4.tgz && mkdir build
76-
77- - name : Prepare Makefile
78- run : cd build && cmake -DWSJT_SKIP_MANPAGES=ON -DWSJT_GENERATE_DOCS=OFF ../wsjtx-2.5.4
79-
80- - name : Compile binaray and create package
81- run : cd build && cmake --build . --target package -- -j3
82-
83- - name : Upload new patched archive
84- uses : actions/upload-artifact@v2
85- with :
86- name : wsjtx-rpi32-package
87- path : build/wsjtx-prefix/src/wsjtx-build/wsjtx_2.5.4_armhf.deb
63+ path : unpack/wsjtx-patched-2.6.1.tgz
8864
8965 build_rpi64 :
9066 needs : ['patch_source']
91- runs-on : ARM64
67+ runs-on : [ self-hosted , Linux , ARM64 ]
9268 steps :
9369 - name : Get source code
9470 uses : actions/checkout@v2
@@ -99,10 +75,10 @@ jobs:
9975 name : wsjtx-patched-code
10076
10177 - name : Prepare environment
102- run : tar -xzvf wsjtx-patched-2.5.4 .tgz && mkdir build
78+ run : tar -xzvf wsjtx-patched-2.6.1 .tgz && mkdir build
10379
10480 - name : Prepare Makefile
105- run : cd build && cmake -DWSJT_SKIP_MANPAGES=ON -DWSJT_GENERATE_DOCS=OFF ../wsjtx-2.5.4
81+ run : cd build && cmake -DWSJT_SKIP_MANPAGES=ON -DWSJT_GENERATE_DOCS=OFF ../wsjtx-2.6.1
10682
10783 - name : Compile binaray and create package
10884 run : cd build && cmake --build . --target package -- -j3
@@ -111,36 +87,16 @@ jobs:
11187 uses : actions/upload-artifact@v2
11288 with :
11389 name : wsjtx-rpi64-package
114- path : build/wsjtx-prefix/src/wsjtx-build/wsjtx_2.5.4_arm64.deb
115-
116- build_focal :
117- needs : ['patch_source']
118- runs-on : ubuntu-latest
119- steps :
120- - name : Get source code
121- uses : actions/checkout@v2
122-
123- - name : Download artifacts
124- uses : actions/download-artifact@v2
125- with :
126- name : wsjtx-patched-code
127-
128- - name : Create Docker Image
129- run : cd $GITHUB_WORKSPACE/docker/ubuntu_focal && docker build . --tag ubuntu_focal_build
130-
131- - name : Run Container
132- run : docker run -t -v $GITHUB_WORKSPACE:/build -w /build ubuntu_focal_build /build/docker/ubuntu_focal/build.sh
133-
134- - name : Upload new patched archive
135- uses : actions/upload-artifact@v2
136- with :
137- name : wsjtx-focal-package
138- path : wsjtx_2.5.4_focal_amd64.deb
90+ path : build/wsjtx-prefix/src/wsjtx-build/wsjtx_2.6.1_arm64.deb
13991
14092 build_jammy :
14193 needs : ['patch_source']
142- runs-on : ubuntu-latest
94+ runs-on : [ self-hosted , Linux , X64 ]
14395 steps :
96+ - name : cleanup # https://github.com/actions/checkout/issues/211
97+ run : |
98+ sudo chown -R $USER:$USER $GITHUB_WORKSPACE
99+
144100 - name : Get source code
145101 uses : actions/checkout@v2
146102
@@ -159,12 +115,16 @@ jobs:
159115 uses : actions/upload-artifact@v2
160116 with :
161117 name : wsjtx-jammy-package
162- path : wsjtx_2.5.4_jammy_amd64 .deb
118+ path : wsjtx_2.6.1_jammy_amd64 .deb
163119
164- build_buster :
120+ build_bookworm :
165121 needs : ['patch_source']
166- runs-on : ubuntu-latest
122+ runs-on : [ self-hosted , Linux , X64 ]
167123 steps :
124+ - name : cleanup # https://github.com/actions/checkout/issues/211
125+ run : |
126+ sudo chown -R $USER:$USER $GITHUB_WORKSPACE
127+
168128 - name : Get source code
169129 uses : actions/checkout@v2
170130
@@ -174,21 +134,25 @@ jobs:
174134 name : wsjtx-patched-code
175135
176136 - name : Create Docker Image
177- run : cd $GITHUB_WORKSPACE/docker/debian_buster && docker build . --tag debian_buster_build
137+ run : cd $GITHUB_WORKSPACE/docker/debian_bookworm && docker build . --tag debian_bookworm_build
178138
179139 - name : Run Container
180- run : docker run -t -v $GITHUB_WORKSPACE:/build -w /build debian_buster_build /build/docker/debian_buster /build.sh
140+ run : docker run -t -v $GITHUB_WORKSPACE:/build -w /build debian_bookworm_build /build/docker/debian_bookworm /build.sh
181141
182142 - name : Upload new patched archive
183143 uses : actions/upload-artifact@v2
184144 with :
185- name : wsjtx-buster -package
186- path : wsjtx_2.5.4_buster_amd64 .deb
145+ name : wsjtx-bookworm -package
146+ path : wsjtx_2.6.1_bookworm_amd64 .deb
187147
188- build_bullseye :
148+ build_fedora39 :
189149 needs : ['patch_source']
190- runs-on : ubuntu-latest
150+ runs-on : [ self-hosted , Linux , X64 ]
191151 steps :
152+ - name : cleanup # https://github.com/actions/checkout/issues/211
153+ run : |
154+ sudo chown -R $USER:$USER $GITHUB_WORKSPACE
155+
192156 - name : Get source code
193157 uses : actions/checkout@v2
194158
@@ -198,21 +162,30 @@ jobs:
198162 name : wsjtx-patched-code
199163
200164 - name : Create Docker Image
201- run : cd $GITHUB_WORKSPACE/docker/debian_bullseye && docker build . --tag debian_bullseye_build
165+ run : cd $GITHUB_WORKSPACE/docker/fedora_39 && docker build . --tag fedora_39_build
202166
203167 - name : Run Container
204- run : docker run -t -v $GITHUB_WORKSPACE:/build -w /build debian_bullseye_build /build/docker/debian_bullseye /build.sh
168+ run : docker run -t -v $GITHUB_WORKSPACE:/build -w /build fedora_39_build /build/docker/fedora_39 /build.sh
205169
206170 - name : Upload new patched archive
207171 uses : actions/upload-artifact@v2
208172 with :
209- name : wsjtx-bullseye -package
210- path : wsjtx_2.5.4_bullseye_amd64.deb
173+ name : wsjtx-fedora39 -package
174+ path : wsjtx-2.6.1.fc39.x86_64.rpm
211175
212- build_fedora36 :
176+ build_windows :
213177 needs : ['patch_source']
214- runs-on : ubuntu-latest
178+ runs-on : [ self-hosted , Windows , X64 ]
215179 steps :
180+ - name : Update execution policy
181+ shell : cmd
182+ run : powershell -Command "Set-ExecutionPolicy RemoteSigned -Scope CurrentUser"
183+
184+ - name : Clear old builds outside workspace
185+ run : |
186+ if (Test-Path -Path "C:\JTSDK64-Tools\tmp\wsjtx-output\") { rm C:\JTSDK64-Tools\tmp\wsjtx-output\ -r }
187+ if (Test-Path -Path "C:\JTSDK64-Tools\tmp\wsjtx\") { rm C:\JTSDK64-Tools\tmp\wsjtx\ -r }
188+
216189 - name : Get source code
217190 uses : actions/checkout@v2
218191
@@ -221,20 +194,27 @@ jobs:
221194 with :
222195 name : wsjtx-patched-code
223196
224- - name : Create Docker Image
225- run : cd $GITHUB_WORKSPACE/docker/fedora_36 && docker build . --tag fedora_36_build
197+ - name : Unpack and prepare to compile
198+ run : |
199+ tar -xzvf .\wsjtx-patched-2.6.1.tgz
200+ tar -xzvf .\wsjtx-2.6.1\src\wsjtx.tgz -C C:\JTSDK64-Tools\tmp\
226201
227- - name : Run Container
228- run : docker run -t -v $GITHUB_WORKSPACE:/build -w /build fedora_36_build /build/docker/fedora_36/build.sh
202+ - name : Check workspace
203+ run : dir C:\JTSDK64-Tools\tmp\
229204
230- - name : Upload new patched archive
205+ - name : Check for JTSDK
206+ run : |
207+ cd c:\JTSDK64-Tools
208+ powershell -ExecutionPolicy Bypass -File .\jtsdk64_test.ps1
209+
210+ - name : Upload Windows package
231211 uses : actions/upload-artifact@v2
232212 with :
233- name : wsjtx-fedora36 -package
234- path : wsjtx-2.5.4.fc36.x86_64.rpm
213+ name : wsjtx-windows -package
214+ path : C:\JTSDK64-Tools\tmp\ wsjtx-output\qt\5.15.2\2.6.1\Release\package\wsjtx-2.6.1-win64.exe
235215
236216 release_draft :
237- needs : ['build_focal' , ' build_jammy' , 'build_rpi32' , ' build_rpi64' , 'build_buster ' , 'build_bullseye ' , 'build_fedora36' ]
217+ needs : ['build_jammy' , 'build_rpi64' , 'build_bookworm ' , 'build_fedora39 ' , 'build_windows' ]
238218 runs-on : ubuntu-latest
239219 steps :
240220 - name : Download artifacts
@@ -253,84 +233,64 @@ jobs:
253233 env :
254234 GITHUB_TOKEN : ${{ github.token }}
255235
256- - name : upload focal artifact
257- uses : actions/upload-release-asset@v1
258- env :
259- GITHUB_TOKEN : ${{ github.token }}
260- with :
261- upload_url : ${{ steps.create_release_draft.outputs.upload_url }}
262- asset_path : wsjtx-focal-package/wsjtx_2.5.4_focal_amd64.deb
263- asset_name : wsjtx_2.5.4_focal_amd64.deb
264- asset_content_type : application/gzip
265-
266236 - name : upload jammy artifact
267237 uses : actions/upload-release-asset@v1
268238 env :
269239 GITHUB_TOKEN : ${{ github.token }}
270240 with :
271241 upload_url : ${{ steps.create_release_draft.outputs.upload_url }}
272- asset_path : wsjtx-jammy-package/wsjtx_2.5.4_jammy_amd64.deb
273- asset_name : wsjtx_2.5.4_jammy_amd64.deb
274- asset_content_type : application/gzip
275-
276- - name : upload buster artifact
277- uses : actions/upload-release-asset@v1
278- env :
279- GITHUB_TOKEN : ${{ github.token }}
280- with :
281- upload_url : ${{ steps.create_release_draft.outputs.upload_url }}
282- asset_path : wsjtx-buster-package/wsjtx_2.5.4_buster_amd64.deb
283- asset_name : wsjtx_2.5.4_buster_amd64.deb
242+ asset_path : wsjtx-jammy-package/wsjtx_2.6.1_jammy_amd64.deb
243+ asset_name : wsjtx_2.6.1_jammy_amd64.deb
284244 asset_content_type : application/gzip
285245
286- - name : upload bullseye artifact
246+ - name : upload bookworm artifact
287247 uses : actions/upload-release-asset@v1
288248 env :
289249 GITHUB_TOKEN : ${{ github.token }}
290250 with :
291251 upload_url : ${{ steps.create_release_draft.outputs.upload_url }}
292- asset_path : wsjtx-bullseye -package/wsjtx_2.5.4_bullseye_amd64 .deb
293- asset_name : wsjtx_2.5.4_bullseye_amd64 .deb
252+ asset_path : wsjtx-bookworm -package/wsjtx_2.6.1_bookworm_amd64 .deb
253+ asset_name : wsjtx_2.6.1_bookworm_amd64 .deb
294254 asset_content_type : application/gzip
295255
296- - name : upload fedora36 artifact
256+ - name : upload fedora39 artifact
297257 uses : actions/upload-release-asset@v1
298258 env :
299259 GITHUB_TOKEN : ${{ github.token }}
300260 with :
301261 upload_url : ${{ steps.create_release_draft.outputs.upload_url }}
302- asset_path : wsjtx-fedora36 -package/wsjtx-2.5.4.fc36 .x86_64.rpm
303- asset_name : wsjtx-2.5.4.fc36 .x86_64.rpm
262+ asset_path : wsjtx-fedora39 -package/wsjtx-2.6.1.fc39 .x86_64.rpm
263+ asset_name : wsjtx-2.6.1.fc39 .x86_64.rpm
304264 asset_content_type : application/gzip
305265
306- - name : upload rpi32 artifact
266+ - name : upload rpi64 artifact
307267 uses : actions/upload-release-asset@v1
308268 env :
309269 GITHUB_TOKEN : ${{ github.token }}
310270 with :
311271 upload_url : ${{ steps.create_release_draft.outputs.upload_url }}
312- asset_path : wsjtx-rpi32 -package/wsjtx_2.5.4_armhf .deb
313- asset_name : wsjtx_2.5.4_armhf .deb
272+ asset_path : wsjtx-rpi64 -package/wsjtx_2.6.1_arm64 .deb
273+ asset_name : wsjtx_2.6.1_arm64 .deb
314274 asset_content_type : application/gzip
315275
316- - name : upload rpi64 artifact
276+ - name : upload windows build
317277 uses : actions/upload-release-asset@v1
318278 env :
319279 GITHUB_TOKEN : ${{ github.token }}
320280 with :
321281 upload_url : ${{ steps.create_release_draft.outputs.upload_url }}
322- asset_path : wsjtx-rpi64 -package/wsjtx_2.5.4_arm64.deb
323- asset_name : wsjtx_2.5.4_arm64.deb
324- asset_content_type : application/gzip
282+ asset_path : wsjtx-windows -package/wsjtx-2.6.1-win64.exe
283+ asset_name : wsjtx-2.6.1-win64.exe
284+ asset_content_type : application/octet-stream
325285
326286 - name : upload patched source code
327287 uses : actions/upload-release-asset@v1
328288 env :
329289 GITHUB_TOKEN : ${{ github.token }}
330290 with :
331291 upload_url : ${{ steps.create_release_draft.outputs.upload_url }}
332- asset_path : wsjtx-patched-code/wsjtx-patched-2.5.4 .tgz
333- asset_name : wsjtx-patched-2.5.4 .tgz
292+ asset_path : wsjtx-patched-code/wsjtx-patched-2.6.1 .tgz
293+ asset_name : wsjtx-patched-2.6.1 .tgz
334294 asset_content_type : application/gzip
335295
336296 clean_artifacts :
@@ -343,10 +303,8 @@ jobs:
343303 name : |
344304 wsjtx-patched-code
345305 wsjtx-source-code
346- wsjtx-focal-package
347306 wsjtx-jammy-package
348- wsjtx-buster-package
349- wsjtx-bullseye-package
350- wsjtx-fedora36-package
351- wsjtx-rpi32-package
307+ wsjtx-bookworm-package
308+ wsjtx-fedora39-package
352309 wsjtx-rpi64-package
310+ wsjtx-windows-package
0 commit comments