Skip to content

Commit d68e0d9

Browse files
committed
Fix for windows
1 parent 8767400 commit d68e0d9

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
chmod 755 external/bin/gcc external/bin/g++
6161
echo '${{ github.workspace }}/external/bin' >> $GITHUB_PATH
6262
63-
- name: Restore MinGW-W64 (Windows) from cache
63+
- name: Restore llvm-mingw (Windows) from cache
6464
if: runner.os == 'Windows'
6565
id: windows-mingw-cache
6666
uses: actions/cache@v4
@@ -76,7 +76,7 @@ jobs:
7676
path: external/dlls-${{ matrix.target.cpu }}
7777
key: 'dlls-${{ matrix.target.cpu }}'
7878

79-
- name: Install MinGW64 dependency (Windows)
79+
- name: Install llvm-mingw dependency (Windows)
8080
if: >
8181
steps.windows-mingw-cache.outputs.cache-hit != 'true' &&
8282
runner.os == 'Windows'
@@ -85,16 +85,16 @@ jobs:
8585
mkdir -p external
8686
LLVM_VERSION="20250730"
8787
MINGW_BASE="https://github.com/mstorsjo/llvm-mingw/releases/download/$LLVM_VERSION"
88-
if [[ '${{ matrix.cpu }}' == 'amd64' ]]; then
88+
if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
8989
MINGW_URL="$MINGW_BASE/llvm-mingw-$LLVM_VERSION-ucrt-x86_64.zip"
9090
ARCH=64
9191
else
9292
MINGW_URL="$MINGW_BASE/llvm-mingw-$LLVM_VERSION-ucrt-i686.zip"
9393
ARCH=32
9494
fi
95-
curl -L "$MINGW_URL" -o "external/mingw-${{ matrix.cpu }}.zip"
96-
7z x -y "external/mingw-${{ matrix.cpu }}.zip" -oexternal/mingw-${{ matrix.cpu }}/
97-
mv external/mingw-${{ matrix.cpu }}/**/* ./external/mingw-${{ matrix.cpu }}
95+
curl -L "$MINGW_URL" -o "external/mingw-${{ matrix.target.cpu }}.zip"
96+
7z x -y "external/mingw-${{ matrix.target.cpu }}.zip" -oexternal/mingw-${{ matrix.target.cpu }}/
97+
mv external/mingw-${{ matrix.target.cpu }}/**/* ./external/mingw-${{ matrix.target.cpu }}
9898
9999
- name: Install DLLs dependencies (Windows)
100100
if: >
@@ -111,7 +111,7 @@ jobs:
111111
runner.os == 'Windows'
112112
shell: bash
113113
run: |
114-
echo '${{ github.workspace }}'"/external/mingw-${{ matrix.cpu }}/bin" >> $GITHUB_PATH
114+
echo '${{ github.workspace }}'"/external/mingw-${{ matrix.target.cpu }}/bin" >> $GITHUB_PATH
115115
echo '${{ github.workspace }}'"/external/dlls-${{ matrix.target.cpu }}" >> $GITHUB_PATH
116116
117117
- name: Setup environment

0 commit comments

Comments
 (0)