Code

[pull] master from OSGeo:master#161

Code

Merged

pull[bot] merged 6 commits intoinnFactory:masterinnFactory/gdal:masterfrom OSGeo:masterOSGeo/gdal:masterCopy head branch name to clipboardJan 18, 2025

+14-8

Commits

Commits on Jan 17, 2025

• CI gdal-master conda: patch version number to X.Y.99

  Show description for 330ef73
  rouault

  committed
  330ef73

  Copy full SHA for 330ef73

• CI: gdal-master conda upload: harden script to detect errors

  Show description for f514b5c
  rouault

  committed
  f514b5c

  Copy full SHA for f514b5c

• Merge pull request #11683 from rouault/ci_conda_upload_harden

  Show description for b0c93fe
  rouault

  authored
  b0c93fe

  Copy full SHA for b0c93fe

• Merge pull request #11685 from rouault/fix_11663

  Show description for 4e27317
  rouault

  authored
  4e27317

  Copy full SHA for 4e27317

Commits on Jan 18, 2025

• ci/travis/conda/setup.sh: try to fix for MacOS

  rouault

  committed
  5d3870f

  Copy full SHA for 5d3870f

• Fix previous commit

  rouault

  committed
  f662155

  Copy full SHA for f662155