From 84bee47dde7b2ce44e18dad8a2c6f5b6754b5a91 Mon Sep 17 00:00:00 2001 From: albert <92109627+Albkat@users.noreply.github.com> Date: Tue, 19 Dec 2023 11:00:02 +0100 Subject: [PATCH] update windows build Signed-off-by: albert <92109627+Albkat@users.noreply.github.com> --- .github/workflows/build.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6fe1b19e..8202ae81 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-latest, windows-latest] build: [meson, cmake] build-type: [debug] compiler: [gnu] @@ -41,7 +41,7 @@ jobs: - os: windows-latest build: meson build-type: debug - compiler: msys + compiler: gnu version: 10 - os: ubuntu-latest @@ -52,20 +52,20 @@ jobs: defaults: run: - shell: ${{ matrix.compiler == 'msys' && 'msys2 {0}' || 'bash' }} + shell: ${{ matrix.os == 'windows-latest' && 'msys2 {0}' || 'bash' }} env: FC: ${{ matrix.compiler == 'intel' && 'ifort' || 'gfortran' }} CC: ${{ matrix.compiler == 'intel' && 'icc' || 'gcc' }} GCC_V: ${{ matrix.version }} - OMP_NUM_THREADS: 1,2,1 + OMP_NUM_THREADS: 1,2 PYTHON_V: 3.8 steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v4 with: python-version: ${{ env.PYTHON_V }} @@ -85,7 +85,7 @@ jobs: --slave /usr/bin/gcov gcov /usr/bin/gcov-${{ env.GCC_V }} - name: Install GCC (Windows) - if: ${{ contains(matrix.os, 'windows') && matrix.compiler == 'msys' }} + if: ${{ contains(matrix.os, 'windows') && matrix.compiler == 'gnu' }} uses: msys2/setup-msys2@v2 with: msystem: MINGW64 @@ -177,7 +177,7 @@ jobs: - name: Install build and test dependencies if: ${{ contains(matrix.os, 'windows') }} - run: pip3 install meson==0.55 + run: pip3 install meson==0.55 - name: Configure build (meson) if: ${{ matrix.build == 'meson' }} @@ -208,7 +208,7 @@ jobs: - name: Run unit tests if: ${{ matrix.build == 'meson' }} run: | - meson test -C ${{ env.BUILD_DIR }} --print-errorlogs --no-rebuild --num-processes 2 -t 2 + meson test -C ${{ env.BUILD_DIR }} --print-errorlogs --no-rebuild --num-processes 1 -t 120 - name: Run unit tests if: ${{ matrix.build == 'cmake' }}