Merge branch 'OSGeo:master' into fix_build_polygon_geometry

OSGeo · Jan 18, 2025 · 336c427 · 336c427
2 parents 9b859e3 + e59bf5d
commit 336c427
Show file tree

Hide file tree

Showing 5 changed files with 531 additions and 277 deletions.
diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
@@ -80,10 +80,10 @@ jobs:
         path: ./gdal-feedstock/packages/
 
     - name: Deploy to gdal-master Conda channel
-      if: github.ref == 'refs/heads/master'
+      if: github.repository == 'OSGeo/GDAL' && github.ref == 'refs/heads/master'
       shell: bash -l {0}
       env:
         ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
       run: |
-          source ../ci/travis/conda/upload.sh || true
+          source ../ci/travis/conda/upload.sh
       working-directory: ./gdal-feedstock