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

Add Canary Islands geoid file #2312

Merged
merged 1 commit into from Aug 6, 2020

Conversation

jjimenezshaw
Copy link
Contributor

... in grid_alternatives.sql

  • Added clear title that can be used to generate release notes

After adding the file in PROJ-data OSGeo/PROJ-data#43, adding to grid_alternatives.sql is needed.

@jjimenezshaw jjimenezshaw marked this pull request as ready for review August 5, 2020 11:26
@jjimenezshaw
Copy link
Contributor Author

Travis CI has a strange behaviour. I can see 3 tasks for travis, when I would expect only 1. Two of them are not finished, but green when you open them. What is going on?

@rouault
Copy link
Member

rouault commented Aug 6, 2020

What is going on?

no idea, but I see that from time to time. Anyway this PR looks good. Merging

@rouault rouault merged commit 1782733 into OSGeo:master Aug 6, 2020
2 checks passed
@PROJ-BOT
Copy link
Contributor

PROJ-BOT commented Aug 6, 2020

The backport to 7.1 failed:

The process 'git' failed with exit code 128

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

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

@rouault rouault added this to the 7.1.1 milestone Aug 6, 2020
@rouault
Copy link
Member

rouault commented Aug 6, 2020

Manually cherry-picked in 7.1 per 93e3ec8

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.

None yet

3 participants