Skip to content

Conversation

@rldhont
Copy link
Collaborator

@rldhont rldhont commented Aug 26, 2025

Update BLEEDING_EDGE E2E QGIS GH Action to QGIS 3.44 the last QGIS version.

@rldhont rldhont requested review from dmarteau and mdouchin August 26, 2025 06:56
@rldhont rldhont added CI & packages tests unit tests and docker configuration for tests labels Aug 26, 2025
@github-actions github-actions bot added this to the 3.11.0 milestone Aug 26, 2025
@dmarteau
Copy link
Member

FYI: #5168 use QGIS 3.40 as ltr and 3.44 as release version: end2end tests pass with 3.40 but fail with 3.44

@rldhont
Copy link
Collaborator Author

rldhont commented Aug 26, 2025

FYI: #5168 use QGIS 3.40 as ltr and 3.44 as release version: end2end tests pass with 3.40 but fail with 3.44

It is the reason of this PR ;-)

@rldhont
Copy link
Collaborator Author

rldhont commented Aug 26, 2025

@dmarteau same error as in #5168 we need to investigate why we do not support 3.44.

@rldhont
Copy link
Collaborator Author

rldhont commented Aug 26, 2025

I made some test locally with QGIS 3.44 and some failed tests does not failed locally. So I think that the test is not well write.

@rldhont rldhont force-pushed the ci-e2e-qgis-3_44 branch 3 times, most recently from 83c4adc to b5e68fd Compare August 28, 2025 10:06
Update BLEEDING_EDGE E2E QGIS GH Action to QGIS 3.44 the last QGIS version.
In QGIS 3.44, the QGIS Server Group metadta has change and the way is wrote in QGIS project to.
@rldhont
Copy link
Collaborator Author

rldhont commented Oct 7, 2025

@dmarteau @mdouchin @nboisteault I have fix QGIS 3.44 support and I will backport it to 3.10 and 3.9

@rldhont rldhont merged commit bb394c4 into 3liz:master Oct 7, 2025
17 of 18 checks passed
@3liz-bot
Copy link
Contributor

3liz-bot commented Oct 7, 2025

The backport to release_3_9 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply bcef93c25... GH Action - E2E QGIS - BLEEDING_EDGE with QGIS 3.44
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 set advice.mergeConflict false"

stdout
Auto-merging .github/workflows/e2e_tests.yml
CONFLICT (content): Merge conflict in .github/workflows/e2e_tests.yml

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

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

@3liz-bot
Copy link
Contributor

3liz-bot commented Oct 7, 2025

The backport to release_3_10 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
To https://github.com/3liz/lizmap-web-client.git
 ! [remote rejected]     backport-6009-to-release_3_10 -> backport-6009-to-release_3_10 (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_10 release_3_10
# Navigate to the new working tree
cd .worktrees/backport-release_3_10
# Create a new branch
git switch --create backport-6009-to-release_3_10
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick bcef93c25c965768fb9166a2b35307e364e503fd,f5756d97a10e7005c149e25364b81e86c82c508f,3c3c65ef70b39a9870d18e41c6dd8601e9598f1b
# Push it to GitHub
git push --set-upstream origin backport-6009-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-6009-to-release_3_10.

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.

3 participants