Skip to content

Commit 6384074

Browse files
rapperskullrapperskull
authored
Fix Release CI
Move to 'softprops/action-gh-release@v1' action Update 'actions/checkout' to v4
1 parent 779b0b6 commit 6384074

File tree

1 file changed

+23
-133
lines changed

1 file changed

+23
-133
lines changed

‎.github/workflows/CI.yml‎

Lines changed: 23 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
platform: x64
4444
artifact_os: Win64
4545
steps:
46-
- uses: actions/checkout@v3
46+
- uses: actions/checkout@v4
4747
- name: CMake generate
4848
run: |
4949
mkdir build && cd build
@@ -57,14 +57,14 @@ jobs:
5757
mv -vb build\${{ matrix.configuration }}\extract-xiso.exe, LICENSE.TXT artifacts
5858
- uses: actions/upload-artifact@v3
5959
with:
60-
name: extract-xiso_${{ matrix.artifact_os }}_${{ matrix.configuration }}
60+
name: extract-xiso-${{ matrix.artifact_os }}-${{ matrix.configuration }}
6161
path: artifacts
6262

6363
build-linux:
6464
runs-on: ubuntu-latest
6565
needs: Init
6666
steps:
67-
- uses: actions/checkout@v3
67+
- uses: actions/checkout@v4
6868
- name: CMake generate
6969
run: |
7070
mkdir build && cd build
@@ -78,14 +78,14 @@ jobs:
7878
mv -v build/extract-xiso LICENSE.TXT artifacts
7979
- uses: actions/upload-artifact@v3
8080
with:
81-
name: extract-xiso_${{ runner.os }}
81+
name: extract-xiso-linux
8282
path: artifacts
8383

8484
build-macos:
8585
runs-on: macos-latest
8686
needs: Init
8787
steps:
88-
- uses: actions/checkout@v3
88+
- uses: actions/checkout@v4
8989
- name: CMake generate
9090
run: |
9191
mkdir build && cd build
@@ -99,7 +99,7 @@ jobs:
9999
mv -v build/extract-xiso LICENSE.TXT artifacts
100100
- uses: actions/upload-artifact@v3
101101
with:
102-
name: extract-xiso_${{ runner.os }}
102+
name: extract-xiso-macos
103103
path: artifacts
104104

105105
build-freebsd:
@@ -108,7 +108,7 @@ jobs:
108108
env:
109109
SYSROOT_PATH: /opt/cross-freebsd-13
110110
steps:
111-
- uses: actions/checkout@v3
111+
- uses: actions/checkout@v4
112112
- name: FreeBSD toolchain setup
113113
run: |
114114
sudo apt-get -qq install clang lld && cd /tmp && \
@@ -131,7 +131,7 @@ jobs:
131131
mv -v build/extract-xiso LICENSE.TXT artifacts
132132
- uses: actions/upload-artifact@v3
133133
with:
134-
name: extract-xiso_freebsd
134+
name: extract-xiso-freebsd
135135
path: artifacts
136136

137137
build-openbsd:
@@ -140,7 +140,7 @@ jobs:
140140
env:
141141
SYSROOT_PATH: /opt/cross-openbsd-7
142142
steps:
143-
- uses: actions/checkout@v3
143+
- uses: actions/checkout@v4
144144
- name: OpenBSD toolchain setup
145145
run: |
146146
sudo apt-get -qq install clang lld && cd /tmp && \
@@ -163,7 +163,7 @@ jobs:
163163
mv -v build/extract-xiso LICENSE.TXT artifacts
164164
- uses: actions/upload-artifact@v3
165165
with:
166-
name: extract-xiso_openbsd
166+
name: extract-xiso-openbsd
167167
path: artifacts
168168

169169
build-netbsd:
@@ -172,7 +172,7 @@ jobs:
172172
env:
173173
SYSROOT_PATH: /opt/cross-netbsd-9
174174
steps:
175-
- uses: actions/checkout@v3
175+
- uses: actions/checkout@v4
176176
- name: NetBSD toolchain setup
177177
run: |
178178
sudo apt-get -qq install clang lld && cd /tmp && \
@@ -195,149 +195,39 @@ jobs:
195195
mv -v build/extract-xiso LICENSE.TXT artifacts
196196
- uses: actions/upload-artifact@v3
197197
with:
198-
name: extract-xiso_netbsd
198+
name: extract-xiso-netbsd
199199
path: artifacts
200200

201201
Release:
202202
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
203203
runs-on: ubuntu-latest
204204
needs: [build-windows, build-linux, build-macos, build-freebsd, build-openbsd, build-netbsd]
205-
env:
206-
BUILD_TAG:
207205
steps:
208206
- name: Download artifacts
209207
uses: actions/download-artifact@v3
210208
with:
211209
path: dist
212210
- name: Create archives
213211
run: |
214-
pushd dist/extract-xiso_Win32_Release
215-
zip -r ../extract-xiso-win32-release.zip *
216-
popd
217-
pushd dist/extract-xiso_Win32_Debug
218-
zip -r ../extract-xiso-win32-debug.zip *
219-
popd
220-
pushd dist/extract-xiso_Win64_Release
221-
zip -r ../extract-xiso-win64-release.zip *
222-
popd
223-
pushd dist/extract-xiso_Win64_Debug
224-
zip -r ../extract-xiso-win64-debug.zip *
225-
popd
226-
pushd dist/extract-xiso_linux
227-
zip -r ../extract-xiso-linux.zip *
228-
popd
229-
pushd dist/extract-xiso_macOS
230-
zip -r ../extract-xiso-macos.zip *
231-
popd
232-
pushd dist/extract-xiso_freebsd
233-
zip -r ../extract-xiso-freebsd.zip *
234-
popd
235-
pushd dist/extract-xiso_openbsd
236-
zip -r ../extract-xiso-openbsd.zip *
237-
popd
238-
pushd dist/extract-xiso_netbsd
239-
zip -r ../extract-xiso-netbsd.zip *
240-
popd
212+
for dir in dist/extract-xiso-*/
213+
do
214+
pushd ${dir}
215+
zip_file="../$(basename ${dir} | tr '[:upper:]' '[:lower:]').zip"
216+
echo "Create ${zip_file}"
217+
zip -r ${zip_file} *
218+
popd
219+
done
241220
- name: Get package info
242221
run: |
243222
echo "BUILD_TAG=$(cat dist/tag/tag)" >> $GITHUB_ENV
244223
- name: Create release
245224
id: create_release
246-
uses: actions/create-release@v1
225+
uses: softprops/action-gh-release@v1
247226
env:
248227
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
249228
with:
250229
tag_name: ${{ env.BUILD_TAG }}
251-
release_name: ${{ env.BUILD_TAG }}
252230
draft: false
253231
prerelease: false
254-
- name: Upload release assets (Win32 build)
255-
id: upload-release-assets-win32-release
256-
uses: actions/upload-release-asset@v1.0.1
257-
env:
258-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
259-
with:
260-
upload_url: ${{ steps.create_release.outputs.upload_url }}
261-
asset_name: extract-xiso-win32-release.zip
262-
asset_path: dist/extract-xiso-win32-release.zip
263-
asset_content_type: application/zip
264-
- name: Upload release assets (Win32 debug build)
265-
id: upload-release-assets-win32-debug
266-
uses: actions/upload-release-asset@v1.0.1
267-
env:
268-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
269-
with:
270-
upload_url: ${{ steps.create_release.outputs.upload_url }}
271-
asset_name: extract-xiso-win32-debug.zip
272-
asset_path: dist/extract-xiso-win32-debug.zip
273-
asset_content_type: application/zip
274-
- name: Upload release assets (Win64 build)
275-
id: upload-release-assets-win64-release
276-
uses: actions/upload-release-asset@v1.0.1
277-
env:
278-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
279-
with:
280-
upload_url: ${{ steps.create_release.outputs.upload_url }}
281-
asset_name: extract-xiso-win64-release.zip
282-
asset_path: dist/extract-xiso-win64-release.zip
283-
asset_content_type: application/zip
284-
- name: Upload release assets (Win64 debug build)
285-
id: upload-release-assets-win64-debug
286-
uses: actions/upload-release-asset@v1.0.1
287-
env:
288-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
289-
with:
290-
upload_url: ${{ steps.create_release.outputs.upload_url }}
291-
asset_name: extract-xiso-win64-debug.zip
292-
asset_path: dist/extract-xiso-win64-debug.zip
293-
asset_content_type: application/zip
294-
- name: Upload release assets (Linux build)
295-
id: upload-release-assets-linux-release
296-
uses: actions/upload-release-asset@v1.0.1
297-
env:
298-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
299-
with:
300-
upload_url: ${{ steps.create_release.outputs.upload_url }}
301-
asset_name: extract-xiso-linux.zip
302-
asset_path: dist/extract-xiso-linux.zip
303-
asset_content_type: application/zip
304-
- name: Upload release assets (macOS build)
305-
id: upload-release-assets-macos-release
306-
uses: actions/upload-release-asset@v1.0.1
307-
env:
308-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
309-
with:
310-
upload_url: ${{ steps.create_release.outputs.upload_url }}
311-
asset_name: extract-xiso-macos.zip
312-
asset_path: dist/extract-xiso-macos.zip
313-
asset_content_type: application/zip
314-
- name: Upload release assets (FreeBSD build)
315-
id: upload-release-assets-freebsd-release
316-
uses: actions/upload-release-asset@v1.0.1
317-
env:
318-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
319-
with:
320-
upload_url: ${{ steps.create_release.outputs.upload_url }}
321-
asset_name: extract-xiso-freebsd.zip
322-
asset_path: dist/extract-xiso-freebsd.zip
323-
asset_content_type: application/zip
324-
- name: Upload release assets (OpenBSD build)
325-
id: upload-release-assets-openbsd-release
326-
uses: actions/upload-release-asset@v1.0.1
327-
env:
328-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
329-
with:
330-
upload_url: ${{ steps.create_release.outputs.upload_url }}
331-
asset_name: extract-xiso-openbsd.zip
332-
asset_path: dist/extract-xiso-openbsd.zip
333-
asset_content_type: application/zip
334-
- name: Upload release assets (NetBSD build)
335-
id: upload-release-assets-netbsd-release
336-
uses: actions/upload-release-asset@v1.0.1
337-
env:
338-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
339-
with:
340-
upload_url: ${{ steps.create_release.outputs.upload_url }}
341-
asset_name: extract-xiso-netbsd.zip
342-
asset_path: dist/extract-xiso-netbsd.zip
343-
asset_content_type: application/zip
232+
fail_on_unmatched_files: true
233+
files: dist/*.zip

0 commit comments

Comments
 (0)