Skip to content

Commit b5dfeb9

Browse files
committed
Moar workflow fixes
1 parent c3af384 commit b5dfeb9

1 file changed

Lines changed: 11 additions & 5 deletions

File tree

.github/workflows/buildtools.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ jobs:
2929
- { os: ubuntu-latest, shell: bash,
3030
directory: send_sid, buildname: send_sid }
3131
- { os: windows-2022, shell: 'msys2 {0}',
32-
directory: config-tool, buildname: cfg_usbsid }
32+
directory: config-tool, buildname: cfg_usbsid.exe }
3333
- { os: windows-2022, shell: 'msys2 {0}',
34-
directory: send_sid, buildname: send_sid }
34+
directory: send_sid, buildname: send_sid.exe }
3535
defaults:
3636
run:
3737
shell: ${{ matrix.shell }}
@@ -62,12 +62,18 @@ jobs:
6262
mingw-w64-x86_64-pkg-config
6363
mingw-w64-x86_64-ninja
6464
65+
- name: Remove pre-built binaries
66+
run: |
67+
pushd master/examples/${{ matrix.directory }}
68+
ls -lhai *.dll ${{ matrix.buildname }}*
69+
rm ${{ matrix.buildname }} ${{ matrix.buildname }}.exe
70+
popd
71+
6572
- name: Configure and build ${{ matrix.buildname }}
6673
run: |
6774
pushd master/examples/${{ matrix.directory }}
6875
cmake -S . -B build && cmake --build build -j$(nproc)
69-
pwd
70-
ls -lhai
76+
ls -lhai *.dll ${{ matrix.buildname }}*
7177
popd
7278
7379
- name: Upload
@@ -76,5 +82,5 @@ jobs:
7682
name: ${{ matrix.buildname }}-${{ matrix.os }}
7783
path: |
7884
master/examples/${{ matrix.directory }}/${{ matrix.buildname }}
79-
master/examples/${{ matrix.directory }}/${{ matrix.buildname }}.exe
85+
${{ matrix.os == 'windows-2022' && format('master/examples/{0}/*.dll', matrix.directory) || '' }}
8086
if-no-files-found: ignore

0 commit comments

Comments
 (0)