Skip to content

Commit 15be1e2

Browse files
committed
ci(check-for-missing-dlls): avoid using deprecated --bitness
Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 29dfcfb commit 15be1e2

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

.github/workflows/main.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -306,27 +306,35 @@ jobs:
306306
strategy:
307307
fail-fast: false
308308
matrix:
309-
bitness: ['32', '64']
309+
arch:
310+
- name: i686
311+
mingw-prefix: mingw32
312+
msystem: MINGW32
313+
sdk-repo: git-sdk-32
314+
- name: x86_64
315+
mingw-prefix: mingw64
316+
msystem: MINGW64
317+
sdk-repo: git-sdk-64
310318
steps:
311319
- uses: actions/checkout@v4
312320
- name: initialize bare SDK clone
313321
shell: bash
314322
run: |
315323
git clone --bare --depth=1 --single-branch --branch=main --filter=blob:none \
316-
https://github.com/git-for-windows/git-sdk-${{ matrix.bitness }} .sdk
317-
- name: build build-installers-${{ matrix.bitness }} artifact
324+
https://github.com/git-for-windows/${{ matrix.arch.sdk-repo }} .sdk
325+
- name: build build-installers-${{ matrix.arch.name }} artifact
318326
shell: bash
319327
run: |
320328
INCLUDE_OBJDUMP=t \
321329
./please.sh create-sdk-artifact \
322-
--bitness=${{ matrix.bitness }} \
330+
--architecture=${{ matrix.arch.name }} \
323331
--sdk=.sdk \
324332
--out=sdk-artifact \
325333
build-installers &&
326334
cygpath -aw "$PWD/sdk-artifact/usr/bin/core_perl" >>$GITHUB_PATH &&
327335
cygpath -aw "$PWD/sdk-artifact/usr/bin" >>$GITHUB_PATH &&
328-
cygpath -aw "$PWD/sdk-artifact/mingw${{ matrix.bitness }}/bin" >>$GITHUB_PATH &&
329-
echo "MSYSTEM=MINGW${{ matrix.bitness }}" >>$GITHUB_ENV
336+
cygpath -aw "$PWD/sdk-artifact/${{ matrix.arch.mingw-prefix }}/bin" >>$GITHUB_PATH &&
337+
echo "MSYSTEM=${{ matrix.arch.msystem }}" >>$GITHUB_ENV
330338
- name: check for missing DLLs
331339
shell: bash
332340
run: ./check-for-missing-dlls.sh

0 commit comments

Comments
 (0)