Skip to content

Commit acf9578

Browse files
authored
Refactor Windows CI workflow for artifact naming
1 parent 05bb122 commit acf9578

File tree

1 file changed

+26
-15
lines changed

1 file changed

+26
-15
lines changed

.github/workflows/windows.yml

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,31 +35,31 @@ jobs:
3535
include:
3636
- platform: Win32
3737
platformAlt: x86
38-
artifactPrefix: "fluidsynth"
38+
osal: "glib"
3939
CFLAGS: ""
4040
CXXFLAGS: ""
41-
CMAKEFLAGS: "-Denable-libinstpatch=0"
41+
CMAKEFLAGS: ""
4242
dep_arch: "x86"
4343
- platform: Win32
4444
platformAlt: x86
45-
artifactPrefix: "fluidsynth-cpp11"
45+
osal: "cpp11"
4646
CFLAGS: "/arch:IA32"
4747
CXXFLAGS: "/arch:IA32"
48-
CMAKEFLAGS: "-Denable-libinstpatch=0 -Dosal=cpp11"
48+
CMAKEFLAGS: ""
4949
dep_arch: "x86"
5050
- platform: x64
5151
platformAlt: x64
52-
artifactPrefix: "fluidsynth"
52+
osal: "glib"
5353
CFLAGS: ""
5454
CXXFLAGS: ""
55-
CMAKEFLAGS: "-Denable-libinstpatch=0"
55+
CMAKEFLAGS: ""
5656
dep_arch: "x64"
5757
- platform: x64
5858
platformAlt: x64
59-
artifactPrefix: "fluidsynth-cpp11"
59+
osal: "cpp11"
6060
CFLAGS: ""
6161
CXXFLAGS: ""
62-
CMAKEFLAGS: "-Denable-libinstpatch=0 -Dosal=cpp11"
62+
CMAKEFLAGS: ""
6363
dep_arch: "x64"
6464

6565
name: 🔨 MSVC ${{ matrix.platform }} ${{ matrix.artifactPrefix }}
@@ -118,6 +118,7 @@ jobs:
118118
cmake -Werror=dev -A ${{ matrix.platform }} -T v143 ^
119119
-DCMAKE_INSTALL_PREFIX=${{ github.workspace }}\${{ env.INSTALL_LOCATION }} ^
120120
-Denable-readline=0 -Denable-floats=1 -Denable-jack=0 -Denable-sdl2=0 ^
121+
-Dosal=${{ matrix.osal }} -Denable-libinstpatch=0 -Denable-dls=1 ^
121122
${{ matrix.CMAKEFLAGS }} -DCMAKE_BUILD_TYPE=Release ^
122123
-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded ^
123124
-DCMAKE_VERBOSE_MAKEFILE=1 -DNO_GUI=1 .. || exit /b 1
@@ -168,10 +169,19 @@ jobs:
168169
exit 1
169170
fi
170171
172+
- name: Set artifact name
173+
id: artifact_name
174+
run: |
175+
if [[ "${{ github.event_name }}" == "release" ]]; then
176+
echo "name=fluidsynth-${{ github.event.release.tag_name }}" >> $GITHUB_OUTPUT
177+
else
178+
echo "name=CI-${{ github.run_id }}" >> $GITHUB_OUTPUT
179+
fi
180+
171181
- name: Upload Artifacts
172182
uses: actions/upload-artifact@v4
173183
with:
174-
name: ${{ matrix.artifactPrefix }}-${{ matrix.platform }}
184+
name: ${{ steps.artifact_name.outputs.name }}-win10-${{ matrix.platformAlt }}
175185
path: ${{ env.INSTALL_LOCATION }}
176186
retention-days: 14
177187
overwrite: true
@@ -425,7 +435,7 @@ jobs:
425435
- name: Upload Artifacts
426436
uses: actions/upload-artifact@v4
427437
with:
428-
name: ${{ matrix.artifactPrefix }}-${{ matrix.platform }}
438+
name: CI-${{ github.run_id }}-${{ github.jobs[github.job].name }}-${{ matrix.artifactPrefix }}-${{ matrix.platform }}
429439
path: ${{ env.INSTALL_LOCATION }}
430440
retention-days: 14
431441
overwrite: true
@@ -497,39 +507,40 @@ jobs:
497507
- name: '${{ matrix.icon }} Upload Artifacts'
498508
uses: actions/upload-artifact@v4
499509
with:
500-
name: ${{env.INSTALL_LOCATION}}-${{matrix.sys}}-${{matrix.osal}}
510+
name: CI-${{ github.run_id }}-${{ github.jobs[github.job].name }}-${{matrix.sys}}-${{matrix.osal}}
501511
path: ${{env.INSTALL_LOCATION}}
502512
retention-days: 14
503513
overwrite: true
504514

505515
# Publish artifacts to GitHub releases (only on release events)
506516
publish-release:
507517
if: github.event_name == 'release' && github.event.action == 'published'
508-
needs: [msvc-build, mingw-build]
518+
needs: [msvc-build]
509519
runs-on: ubuntu-latest
510520
steps:
511521
- name: Download all artifacts
512522
uses: actions/download-artifact@v4
513523
with:
514524
path: artifacts
525+
pattern: fluidsynth-*
526+
merge-multiple: true
515527

516528
- name: Create release archives
517529
run: |
518530
cd artifacts
531+
ls -la
519532
for dir in */; do
520533
if [[ "$dir" == fluidsynth* ]]; then
521534
echo "Creating archive for $dir"
522-
tar -czf "${dir%/}.tar.gz" -C "$dir" .
523535
zip -r "${dir%/}.zip" "$dir"
524536
fi
525537
done
526-
ls -la *.tar.gz *.zip
538+
ls -la *.zip
527539
528540
- name: Upload release assets
529541
uses: softprops/action-gh-release@v2
530542
with:
531543
files: |
532-
artifacts/*.tar.gz
533544
artifacts/*.zip
534545
env:
535546
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)