OSGeo / gdal

GDAL is an open source MIT licensed translator library for raster and vector geospatial data formats.
https://gdal.org
Other
4.91k stars 2.55k forks source link

CI: try to solve issue with maxim-lobanov/setup-xcode action no longer accepting xcode 14.3 #11221

Closed rouault closed 1 week ago

rouault commented 1 week ago

The backport to release/3.10 failed:

The process '/usr/bin/git' failed with exit code 1
stderr ``` To https://github.com/OSGeo/gdal.git ! [remote rejected] backport-11221-to-release/3.10 -> backport-11221-to-release/3.10 (refusing to allow a Personal Access Token to create or update workflow `.github/workflows/cmake_builds.yml` without `workflow` scope) error: failed to push some refs to 'https://github.com/OSGeo/gdal.git' ```

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release/3.10 release/3.10
# Navigate to the new working tree
cd .worktrees/backport-release/3.10
# Create a new branch
git switch --create backport-11221-to-release/3.10
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 3050b5c7d66bee960bdfe93d216b7a6f1fd35140
# Push it to GitHub
git push --set-upstream origin backport-11221-to-release/3.10
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.10

Then, create a pull request where the base branch is release/3.10 and the compare/head branch is backport-11221-to-release/3.10.

rouault commented 1 week ago

cherry-picked to 3.10 per 20d091dc583d7788ad7167d6f486f83de74add7a