From dbe7aaaa1b085cf8a93937e4c8f797f1c638e00c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 8 Oct 2024 20:55:55 +0800 Subject: [PATCH] CI: use mingw32 for windows-i686 --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 73d7a20c7..fa13aeca9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -555,9 +555,9 @@ jobs: - name: setup-msys2 uses: msys2/setup-msys2@v2 with: - msystem: CLANG32 + msystem: MINGW32 update: true - install: git p7zip mingw-w64-clang-i686-cmake mingw-w64-clang-i686-clang mingw-w64-clang-i686-vulkan-loader mingw-w64-clang-i686-vulkan-headers mingw-w64-clang-i686-opencl-icd mingw-w64-clang-i686-opencl-headers + install: git p7zip mingw-w64-i686-cmake mingw-w64-i686-clang mingw-w64-i686-vulkan-loader mingw-w64-i686-vulkan-headers mingw-w64-i686-opencl-icd mingw-w64-i686-opencl-headers - name: print msys version run: uname -a @@ -568,7 +568,7 @@ jobs: languages: c, cpp - name: configure project - run: env PKG_CONFIG_PATH=/clang32/lib/pkgconfig/:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On . + run: env PKG_CONFIG_PATH=/mingw32/lib/pkgconfig/:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On . - name: build project run: cmake --build . --verbose -j4 @@ -577,7 +577,7 @@ jobs: uses: github/codeql-action/analyze@v3 - name: copy necessary dlls - run: cp /clang32/bin/{OpenCL,vulkan-1}.dll . + run: cp /mingw32/bin/{OpenCL,vulkan-1}.dll . - name: download amd_ags run: curl -LO https://github.com/GPUOpen-LibrariesAndSDKs/AGS_SDK/raw/master/ags_lib/lib/amd_ags_x86.dll