Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CRS::promoteTo3D(): propagate the extent from the 2D CRS (fixes #2587) #2589

Merged
merged 1 commit into from
Mar 19, 2021

Conversation

rouault
Copy link
Member

@rouault rouault commented Mar 19, 2021

This will help getting more consistent results between the 2D and 3D
cases, as identified in
#2587 (comment)

…#2587)

This will help getting more consistent results between the 2D and 3D
cases, as identified in
OSGeo#2587 (comment)
@rouault rouault merged commit ac9c36e into OSGeo:master Mar 19, 2021
@rouault
Copy link
Member Author

rouault commented Mar 19, 2021

@kbevers The backport bot doesn't seem to work

@rouault rouault added this to the 8.0.1 milestone Mar 19, 2021
@rouault
Copy link
Member Author

rouault commented Mar 19, 2021

Backported manually per fda6819

@kbevers
Copy link
Member

kbevers commented Mar 19, 2021

@rouault yeah, I've noticed. Trying to figure out why. From https://github.com/OSGeo/PROJ/runs/2149909330?check_suite_focus=true we get this

Current runner version: '2.277.1'
Operating System
Virtual Environment
GITHUB_TOKEN Permissions
  Actions: read
  Checks: read
  Contents: read
  Deployments: read
  Issues: read
  Metadata: read
  OrganizationPackages: read
  Packages: read
  PullRequests: read
  RepositoryProjects: read
  SecurityEvents: read
  Statuses: read
Prepare workflow directory
Prepare all required actions
Getting action download info
Download action repository 'm-kuhn/backport@v1.1.1'

as opposed to this from QGIS (https://github.com/qgis/QGIS/pull/42320/checks?check_run_id=2144090138)

Current runner version: '2.277.1'
Operating System
Virtual Environment
GITHUB_TOKEN Permissions
  Actions: write
  Checks: write
  Contents: write
  Deployments: write
  Issues: write
  Metadata: read
  OrganizationPackages: write
  Packages: write
  PullRequests: write
  RepositoryProjects: write
  SecurityEvents: write
  Statuses: write
Prepare workflow directory
Prepare all required actions
Getting action download info
Download action repository 'm-kuhn/backport@v1.1.1'

So there's some problems with setting the correct access levels on the GITHUB_TOKEN but I can't figure out how to change it.

@github-actions
Copy link
Contributor

The backport to 8.0 failed:

The process '/usr/bin/git' failed with exit code 1

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-8.0 8.0
# Navigate to the new working tree
cd .worktrees/backport-8.0
# Create a new branch
git switch --create backport-2589-to-8.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick --mainline 1 ac9c36e1b42475700c80410dd6d59f8c8f9db447
# Push it to GitHub
git push --set-upstream origin backport-2589-to-8.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-8.0

Then, create a pull request where the base branch is 8.0 and the compare/head branch is backport-2589-to-8.0.

@kbevers
Copy link
Member

kbevers commented Mar 19, 2021

After a few modifications in the backport setup it seems to get the permissions right now. See https://github.com/OSGeo/PROJ/runs/2150343487?check_suite_focus=true. It fails here for obvious reasons but I hope it works on future pull requests.

In the log it is stated that the action is stil limited to single commit PRs:

However, Backport only supports rebased and merged pull requests with a single commit and squashed and merged pull requests.
Consider only allowing squash merging.

However m-kuhn/backport@412793d seems to actually fix that. Time will tell what works, I guess.

@rouault
Copy link
Member Author

rouault commented Mar 19, 2021

After a few modifications in the backport setup

could you explain what you did exactly ? Could be of interest for GDAL as well

@kbevers
Copy link
Member

kbevers commented Mar 19, 2021

Yes. I simply copied the backport.yml file from QGIS. At first I thought it was only necessary to change the repository of the action and remove unused tokens. Did that in 5edc28e. That didn't work so tried adding id: backport as well in 8f4074e. Also without success. Finally I changed the trigger(?) to pull_request_target in 15119f2. With those three commits we've now got an exact copy of the equivalent file in the QGIS repo (expect for a missing emoji in the name of the action). So in short, just make a copy of the file from QGIS. I did not have to fiddle with repository settings to get to this point.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants