diff --git a/.github/workflows/on_PR_meson.yaml b/.github/workflows/on_PR_meson.yaml index 67b5dfe1..6432a5e1 100644 --- a/.github/workflows/on_PR_meson.yaml +++ b/.github/workflows/on_PR_meson.yaml @@ -29,7 +29,30 @@ jobs: meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Dwarning_level=3 meson compile -C "${{github.workspace}}/build" --verbose meson test -C "${{github.workspace}}/build" --verbose + Ubuntu-clang: + runs-on: ubuntu-20.04 + name: Linux-Clang${{matrix.cxx}}-${{matrix.deps}} + strategy: + matrix: + cxx: ['7', '8', '9', '10', '12'] + deps: ['forcefallback', 'default'] + steps: + - uses: actions/checkout@v3 + + - name: Install packages + run: | + sudo apt install -y clang-${{matrix.cxx}} libc++abi-${{matrix.cxx}}-dev libc++-${{matrix.cxx}}-dev lld-${{matrix.cxx}} + python3 -m pip install meson ninja + - name: Compile and Test + env: + CXX: clang++-${{matrix.cxx}} + CXXFLAGS: -stdlib=libc++ + CXX_LD: lld-${{matrix.cxx}} + run: | + meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Dwarning_level=3 -Dcpp_std=c++20 + meson compile -C "${{github.workspace}}/build" --verbose + meson test -C "${{github.workspace}}/build" --verbose VisualStudio: runs-on: windows-latest name: MSVC-${{matrix.deps}}-${{matrix.platform}} diff --git a/.github/workflows/on_PR_meson_clang.yaml b/.github/workflows/on_PR_meson_clang.yaml deleted file mode 100644 index fc5da6e8..00000000 --- a/.github/workflows/on_PR_meson_clang.yaml +++ /dev/null @@ -1,33 +0,0 @@ -name: On PRs - meson linux clang - -on: pull_request - -concurrency: - group: ${{github.workflow}}-${{github.head_ref}} - cancel-in-progress: true - -jobs: - Ubuntu: - runs-on: ubuntu-20.04 - name: Linux-Clang${{matrix.cxx}}-${{matrix.deps}} - strategy: - matrix: - cxx: ['7', '8', '9', '10', '12'] - deps: ['forcefallback', 'default'] - steps: - - uses: actions/checkout@v3 - - - name: Install packages - run: | - sudo apt install -y clang-${{matrix.cxx}} libc++abi-${{matrix.cxx}}-dev libc++-${{matrix.cxx}}-dev lld-${{matrix.cxx}} - python3 -m pip install meson ninja - - - name: Compile and Test - env: - CXX: clang++-${{matrix.cxx}} - CXXFLAGS: -stdlib=libc++ - CXX_LD: lld-${{matrix.cxx}} - run: | - meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Dwarning_level=3 -Dcpp_std=c++20 - meson compile -C "${{github.workspace}}/build" --verbose - meson test -C "${{github.workspace}}/build" --verbose