Merge pull request #382 from openzim/multiple-ci-small-improvements

openzim · Nov 7, 2023 · b8a0a4c · b8a0a4c
2 parents 66371fa + a32caad
commit b8a0a4c
Showing 1 changed file with 25 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,26 +1,43 @@
 name: CI
 
-on: [push]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
 
 jobs:
-  Macos:
-    runs-on: macos-11
+  macOS:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - macos-11
+          - macos-12
+          - macos-13
+    runs-on: ${{ matrix.os }}
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-      - name: Setup python 3.7
-        uses: actions/setup-python@v1
+
+      - name: Setup python 3.9
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.7'
+          python-version: '3.9'
+
       - name: Install packages
         run: brew install gcovr ninja libmagic
+
       - name: Install python modules
         run: pip3 install meson==0.49.2 pytest
+
       - name: Install deps
         shell: bash
         run: |
-          ARCHIVE_NAME=deps2_osx_native_dyn_zim-tools.tar.xz
+          ARCHIVE_NAME=deps2_macos_native_dyn_zim-tools.tar.xz
           wget -O- http://tmp.kiwix.org/ci/${ARCHIVE_NAME} | tar -xJ -C $HOME
+
       - name: Compile
         shell: bash
         run: |
@@ -58,7 +75,7 @@ jobs:
       HOME: /home/runner
     runs-on: ubuntu-22.04
     container:
-      image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:38"
+      image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2023-10-30"
     steps:
     - name: Extract branch name
       shell: bash