Skip to content

GH Action - Check for QGIS Server status and git diff - #5190

Merged
Gustry merged 1 commit into
3liz:release_3_9from
Gustry:git-status-qgis-server
Jan 13, 2025
Merged

GH Action - Check for QGIS Server status and git diff#5190
Gustry merged 1 commit into
3liz:release_3_9from
Gustry:git-status-qgis-server

Conversation

@Gustry

@Gustry Gustry commented Jan 13, 2025

Copy link
Copy Markdown
Contributor

Backport #5189

@Gustry
Gustry merged commit 064dac7 into 3liz:release_3_9 Jan 13, 2025
@Gustry
Gustry deleted the git-status-qgis-server branch January 13, 2025 16:31
@3liz-bot

Copy link
Copy Markdown
Contributor

The backport to release_3_7 failed:

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

@3liz-bot

Copy link
Copy Markdown
Contributor

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-5190-to-release_3_8 -> backport-5190-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-5190-to-release_3_8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick a279fd7cfc9d169faf680d80d207cedf5416e5f9
# Push it to GitHub
git push --set-upstream origin backport-5190-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-5190-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