From 91e3218eaa20be86c6485d85adbf4b21d459f7fe Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 14 Jun 2024 09:13:42 +0100 Subject: Extract action to set up msys2 --- .github/workflows/build.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ff05e7..418829a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -160,17 +160,10 @@ jobs: with: python-version: '3.11' - - name: set up MSYS2 - uses: msys2/setup-msys2@v2 + - name: Set up MSYS2 + uses: ./.github/actions/setup-msys2 with: - release: false - msystem: ${{ matrix.arch == 'x86' && 'mingw32' || 'ucrt64' }} - install: make mingw-w64-${{ matrix.arch == 'x86' && 'i686' || 'ucrt-x86_64' }}-gcc - - - name: Set PATH for x86 - if: ${{ matrix.arch == 'x86' }} - shell: msys2 {0} - run: echo "C:/msys64/mingw32/bin" >> "$GITHUB_PATH" + arch: ${{ matrix.arch }} - name: Print build identifiers run: | -- cgit v1.2.3