CI: fix Conda builds

OSGeo · Aug 26, 2024 · f43295a · f43295a
1 parent 54913a4
commit f43295a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
@@ -22,12 +22,12 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        # macos-12: Intel
+        # macos-13: Intel
         # macos-14: arm64
-        platform: ['ubuntu-latest','windows-latest','macos-12','macos-14']
+        platform: ['ubuntu-latest','windows-latest','macos-13','macos-14']
 
     env:
-      PLATFORM: ${{ matrix.platform }}
+      GHA_CI_PLATFORM: ${{ matrix.platform }}
 
     steps:
     - uses: actions/checkout@v4

diff --git a/scripts/ci/conda/compile.sh b/scripts/ci/conda/compile.sh
@@ -2,7 +2,26 @@
 
 mkdir packages
 
-conda build recipe --clobber-file recipe/recipe_clobber.yaml --output-folder packages
+CONDA_PLAT=""
+if grep -q "windows" <<< "$GHA_CI_PLATFORM"; then
+    CONDA_PLAT="win"
+    ARCH="64"
+fi
+
+if grep -q "ubuntu" <<< "$GHA_CI_PLATFORM"; then
+    CONDA_PLAT="linux"
+    ARCH="64"
+fi
+
+if grep -q "macos-14" <<< "$GHA_CI_PLATFORM"; then
+    CONDA_PLAT="osx"
+    ARCH="arm64"
+elif grep -q "macos" <<< "$GHA_CI_PLATFORM"; then
+    CONDA_PLAT="osx"
+    ARCH="64"
+fi
+
+conda build recipe --clobber-file recipe/recipe_clobber.yaml --output-folder packages -m ".ci_support/${CONDA_PLAT}_${ARCH}_.yaml"
 conda install -c ./packages proj
 
 #projinfo -s NAD27 -t EPSG:4269 --area "USA - Missouri"
diff --git a/scripts/ci/conda/setup.sh b/scripts/ci/conda/setup.sh
@@ -10,8 +10,7 @@ git clone https://github.com/conda-forge/proj.4-feedstock.git
 cd proj.4-feedstock
 cat > recipe/recipe_clobber.yaml <<EOL
 source:
-  git_url: https://github.com/OSGeo/PROJ.git
-  git_rev: ${GITHUB_SHA}
+  path: ../../../PROJ
   url:
   sha256:
   patches: