From 667800f6669e8c2efbf2078f54b982f486621876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Vitor=20Polverari?= Date: Sun, 24 Mar 2024 13:04:36 -0300 Subject: [PATCH] Commented out the MSYS2 Build for now until it gets resolved --- .github/workflows/build.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 606d11e95..33a84d43c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -126,10 +126,10 @@ jobs: runs-on: windows-latest strategy: matrix: - target: ["msvc", "msys2"] + target: ["msvc"] # Removing "msys2" from the target list defaults: run: - shell: ${{ (matrix.target == 'msys2' && 'msys2') || 'bash' }} {0} + shell: bash {0} #shell: ${{ (matrix.target == 'msys2' && 'msys2') || 'bash' }} {0} env: CCACHE_DIR: ${{ github.workspace }}/.ccache CCACHE_COMPILERCHECK: content @@ -149,20 +149,20 @@ jobs: ${{ runner.os }}-${{ matrix.target }}- - name: Set up MSVC uses: ilammy/msvc-dev-cmd@v1 - if: ${{ matrix.target == 'msvc' }} + # if: ${{ matrix.target == 'msvc' }} - name: Install extra tools (MSVC) run: choco install ccache ninja wget - if: ${{ matrix.target == 'msvc' }} - - name: Set up MSYS2 - uses: msys2/setup-msys2@v2 - if: ${{ matrix.target == 'msys2' }} - with: - msystem: clang64 - update: true - install: git make p7zip - pacboy: >- - toolchain:p ccache:p cmake:p ninja:p - qt6-base:p qt6-multimedia:p qt6-multimedia-wmf:p qt6-tools:p qt6-translations:p + # if: ${{ matrix.target == 'msvc' }} + # - name: Set up MSYS2 + # uses: msys2/setup-msys2@v2 + # if: ${{ matrix.target == 'msys2' }} + # with: + # msystem: clang64 + # update: true + # install: git make p7zip + # pacboy: >- + # toolchain:p ccache:p cmake:p ninja:p + # qt6-base:p qt6-multimedia:p qt6-multimedia-wmf:p qt6-tools:p qt6-translations:p - name: Disable line ending translation run: git config --global core.autocrlf input - name: Build