Merge pull request #4020 from rouault/ci_mac_arm64

CI: add a M1 ARM64 MacOS runner

.github/workflows/mac.yml

@@ -15,25 +15,35 @@ concurrency:
 jobs:
 
   macos_build:
-    runs-on: macos-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        include:
+          - platform: "macos-latest"
+            architecture: "x64"
+          # macOS-14 is a M1 ARM64 MacOS runner: https://github.blog/changelog/2024-01-30-github-actions-introducing-the-new-m1-macos-runner-available-to-open-source/
+          - platform: "macOS-14"
+            architecture: "arm64"
+
+    runs-on: ${{ matrix.platform }}
+
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
 
       - uses: actions/checkout@v3
 
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: mamba-org/setup-micromamba@v1
         with:
-          miniforge-variant: Mambaforge
-          miniforge-version: latest
-          use-mamba: true
+          init-shell: bash
+          environment-file: .github/workflows/mac/environment.yml
 
       - name: Cache
         uses: actions/cache@v3
         id: cache
         with:
           path: ${{ github.workspace }}/.ccache
-          key: ${{ runner.os }}-cache-mac-${{ github.run_id }}
-          restore-keys: ${{ runner.os }}-cache-mac-
+          key: ${{ runner.os }}-cache-mac-${{ matrix.architecture }}-${{ github.run_id }}
+          restore-keys: ${{ runner.os }}-cache-mac-${{ matrix.architecture }}-
 
       - name: Install Requirements
         shell: bash -l {0}

.github/workflows/mac/before_install.sh

@@ -2,6 +2,4 @@
 
 set -e
 
-mamba install --yes --quiet compilers
-mamba install --yes --quiet python=3.8 autoconf automake libtool pkg-config ccache jsonschema
-mamba install --yes --quiet --only-deps proj=7.1.1=h45baca5_3
+mamba install --yes --quiet --only-deps proj

.github/workflows/mac/environment.yml

@@ -0,0 +1,16 @@
+name: proj
+channels:
+  - conda-forge
+dependencies:
+  - python=3.8
+  - conda
+  - mamba
+  - compilers
+  - ninja
+  - cmake
+  - pkg-config
+  - ccache
+  - autoconf
+  - automake
+  - jsonschema
+

test/gie/builtins.gie

@@ -7238,7 +7238,8 @@ expect  failure errno coord_transfm_outside_projection_domain
 -------------------------------------------------------------------------------
 operation +proj=vandg +a=6400000 +over
 -------------------------------------------------------------------------------
-tolerance 0.25 mm
+# 0.25 is OK for Intel platforms, but on Mac M1 ARM64 we need 0.35
+tolerance 0.35 mm
 
 accept  2 1
 expect  223395.249543407 111704.596633675

travis/install.sh

@@ -25,6 +25,9 @@ else
     USE_CCACHE=OFF
 fi
 
+# Ensure directory exists for PROJ_DB_CACHE_DIR
+mkdir -p $HOME/.ccache
+
 if test "x${CMAKE_BUILD_TYPE}" = "x"; then
     CMAKE_BUILD_TYPE=Release
 fi