meson CI: move clang workflow to the same file

Signed-off-by: Rosen Penev <rosenp@gmail.com>

.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}}

.github/workflows/on_PR_meson_clang.yaml

@@ -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