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

Remove Stamen key from CFG file #3987

Merged
merged 1 commit into from
Nov 27, 2023
Merged

Remove Stamen key from CFG file #3987

merged 1 commit into from
Nov 27, 2023

Conversation

Gustry
Copy link
Member

@Gustry Gustry commented Nov 27, 2023

Amen

Related to #3914

Note, I didn't remove it from tests/units/classes/Project/Ressources, as I might break JS units, and there is still the code in the main code.

@Gustry Gustry added run end2end If the PR must run end2end tests or not backport release_3_6 backport release_3_7 labels Nov 27, 2023
@github-actions github-actions bot added this to the 3.8.0 milestone Nov 27, 2023
@github-actions github-actions bot added the tests unit tests and docker configuration for tests label Nov 27, 2023
@Gustry Gustry merged commit b42b45f into 3liz:master Nov 27, 2023
9 checks passed
@Gustry Gustry deleted the stamen branch November 27, 2023 14:18
@3liz-bot
Copy link
Contributor

The backport to release_3_6 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 0972e35bb... Remove Stamen key from CFG file
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
CONFLICT (modify/delete): tests/end2end/playwright/base-layers.spec.js deleted in HEAD and modified in 0972e35bb (Remove Stamen key from CFG file).  Version 0972e35bb (Remove Stamen key from CFG file) of tests/end2end/playwright/base-layers.spec.js left in tree.
Auto-merging tests/qgis-projects/tests/base_layers.qgs.cfg
CONFLICT (content): Merge conflict in tests/qgis-projects/tests/base_layers.qgs.cfg
Auto-merging tests/qgis-projects/tests/overview-3857.qgs.cfg

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3_7 failed backport run end2end If the PR must run end2end tests or not tests unit tests and docker configuration for tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants