diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7b15e7f49e4..5db4ee82ec1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,12 +1,18 @@
-name: CI
+name: macOS-CI
 on: push
 
 permissions:
   contents: read
 
 jobs:
-  CI:
-    runs-on: macos-latest
+  macOS-CI:
+    strategy:
+      matrix:
+        glx_option: ['dri', 'xlib']
+    runs-on: macos-11
+    env:
+      GALLIUM_DUMP_CPU: true
+      MESON_EXEC: /Users/runner/Library/Python/3.11/bin/meson
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -20,20 +26,34 @@ jobs:
         brew "libxcb"
         brew "libxdamage"
         brew "libxext"
-        brew "meson"
+        brew "ninja"
         brew "pkg-config"
         brew "python@3.10"
         EOL
 
         brew update
         brew bundle --verbose
-    - name: Install Mako
-      run: pip3 install --user mako
+    - name: Install Mako and meson
+      run: pip3 install --user mako meson
     - name: Configure
-      run: meson . build -Dbuild-tests=true -Dosmesa=true
+      run: |
+        cat > native_config <<EOL
+        [binaries]
+        llvm-config = '/usr/local/opt/llvm/bin/llvm-config'
+        EOL
+        $MESON_EXEC . build --native-file=native_config -Dbuild-tests=true -Dosmesa=true -Dgallium-drivers=swrast -Dglx=${{ matrix.glx_option }}
     - name: Build
-      run: meson compile -C build
+      run: $MESON_EXEC compile -C build
     - name: Test
-      run: meson test -C build --print-errorlogs
+      run: $MESON_EXEC test -C build --print-errorlogs
     - name: Install
-      run: meson install -C build
+      run: $MESON_EXEC install -C build --destdir $PWD/install
+    - name: 'Upload Artifact'
+      if: always()
+      uses: actions/upload-artifact@v3
+      with:
+        name: macos-${{ matrix.glx_option }}-result
+        path: |
+          build/meson-logs/
+          install/
+        retention-days: 5