From 5346ef937d5fbf25781bd84ff089fa2ca53f1ae7 Mon Sep 17 00:00:00 2001 From: rami3l Date: Mon, 3 Jun 2024 11:58:59 +0800 Subject: [PATCH] fixup! ci(windows/gnu): install `mingw` via `msys2/setup-msys2` --- .github/workflows/ci.yaml | 6 ++++++ ci/actions-templates/windows-builds-template.yaml | 2 ++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d1a62accff3..c476ad63995 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -66,6 +66,8 @@ jobs: run: | echo "C:\msys64\usr\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 echo "C:\msys64\${{ matrix.mingwdir }}\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 + where x86_64-w64-mingw32-gcc + where i686-w64-mingw32-gcc - name: Set PATH run: | echo "%USERPROFILE%\.cargo\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 @@ -206,6 +208,8 @@ jobs: run: | echo "C:\msys64\usr\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 echo "C:\msys64\${{ matrix.mingwdir }}\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 + where x86_64-w64-mingw32-gcc + where i686-w64-mingw32-gcc - name: Set PATH run: | echo "%USERPROFILE%\.cargo\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 @@ -350,6 +354,8 @@ jobs: run: | echo "C:\msys64\usr\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 echo "C:\msys64\${{ matrix.mingwdir }}\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 + where x86_64-w64-mingw32-gcc + where i686-w64-mingw32-gcc - name: Set PATH run: | echo "%USERPROFILE%\.cargo\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 diff --git a/ci/actions-templates/windows-builds-template.yaml b/ci/actions-templates/windows-builds-template.yaml index 447913d88b8..1fe4efcbaf5 100644 --- a/ci/actions-templates/windows-builds-template.yaml +++ b/ci/actions-templates/windows-builds-template.yaml @@ -58,6 +58,8 @@ jobs: # skip-master skip-pr skip-stable run: | echo "C:\msys64\usr\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 echo "C:\msys64\${{ matrix.mingwdir }}\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 + where x86_64-w64-mingw32-gcc + where i686-w64-mingw32-gcc - name: Set PATH run: | echo "%USERPROFILE%\.cargo\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8