From 3fa857f24bb104492f31c9afa1c885c4206792ec Mon Sep 17 00:00:00 2001 From: Luke Bemish Date: Mon, 15 Jul 2024 23:21:40 -0500 Subject: [PATCH] Switch how msys is set up --- .github/workflows/commit.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml index 6f9396c..8c0b2e7 100644 --- a/.github/workflows/commit.yml +++ b/.github/workflows/commit.yml @@ -53,24 +53,31 @@ jobs: - name: Setup GCC if: ${{ matrix.compiler_package }} run: sudo apt install -y ${{ matrix.compiler_package }} - - name: Setup MSYS + - name: '${{ matrix.icon }} Setup MSYS2' if: ${{ matrix.msys }} uses: msys2/setup-msys2@v2 with: msystem: ${{ matrix.msys }} - path-type: inherit + update: true + install: >- + git + make + pacboy: >- + toolchain:p + cmake:p + ninja:p - name: Configure CMake if: ${{ !matrix.msys }} shell: bash run: > - cmake -B cmakebuild -G Ninja + cmake -B cmakebuild --toolchain="toolchains/${{ matrix.os }}-${{ matrix.arch }}.cmake" -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} - name: Configure CMake if: ${{ matrix.msys }} shell: msys2 {0} run: > - cmake -B cmakebuild -G Ninja + cmake -B cmakebuild --toolchain="toolchains/${{ matrix.os }}-${{ matrix.arch }}.cmake" -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} - name: Build