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

Tests - Add embed base layers in the test project #4846

Merged
merged 3 commits into from
Oct 7, 2024

Conversation

Gustry
Copy link
Member

@Gustry Gustry commented Oct 7, 2024

Related to #4169

CC @arno974 I just tried, it works on this example, I didn't update any code, just the test data for now.

@Gustry Gustry added run end2end If the PR must run end2end tests or not backport release_3_7 backport release_3_8 labels Oct 7, 2024
@github-actions github-actions bot added this to the 3.9.0 milestone Oct 7, 2024
@Gustry Gustry merged commit ccbe4e9 into 3liz:master Oct 7, 2024
12 of 13 checks passed
@Gustry Gustry deleted the embed_base_layers branch October 7, 2024 13:44
@3liz-bot
Copy link
Contributor

3liz-bot commented Oct 7, 2024

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply dcadcc58b... Tests - Add embed base layers in the test project
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".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging tests/units/classes/Project/ProjectTest.php
CONFLICT (content): Merge conflict in tests/units/classes/Project/ProjectTest.php
Auto-merging tests/units/classes/Project/QgisProjectTest.php

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

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

@3liz-bot
Copy link
Contributor

3liz-bot commented Oct 7, 2024

The backport to release_3_8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
To https://github.com/3liz/lizmap-web-client.git
 ! [remote rejected]     backport-4846-to-release_3_8 -> backport-4846-to-release_3_8 (refusing to allow a Personal Access Token to create or update workflow `.github/workflows/e2e_tests.yml` without `workflow` scope)
error: failed to push some refs to 'https://github.com/3liz/lizmap-web-client.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_8 release_3_8
# Navigate to the new working tree
cd .worktrees/backport-release_3_8
# Create a new branch
git switch --create backport-4846-to-release_3_8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick dcadcc58b2985d5cdca2c64d62dfd93cddb2a7b6,1d8eaf67a76329c46d074e6492e28f3aff2cb7b9,3c32d7d81f86a7dbf2008e4beb490629a11ade90
# Push it to GitHub
git push --set-upstream origin backport-4846-to-release_3_8
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_8

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

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

Successfully merging this pull request may close these issues.

2 participants