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

Update formatting of the Docker container to pull from #9435

Merged
merged 2 commits into from
Nov 30, 2024

Conversation

DelazJ
Copy link
Collaborator

@DelazJ DelazJ commented Nov 30, 2024

The formatting of the releases container
name has changed, moving from the branch name to simply the release number
Refs #9433 and #9434

Goal:

Ticket(s): #

  • Backport to LTR documentation is requested

@DelazJ DelazJ added Backend backport release_3.34 On merge create a backported pull request to 3.34 backport release_3.40 On merge create a backported pull request to 3.40 labels Nov 30, 2024
@DelazJ DelazJ enabled auto-merge (rebase) November 30, 2024 07:31
@DelazJ DelazJ merged commit 95615d2 into qgis:master Nov 30, 2024
6 checks passed
@DelazJ DelazJ deleted the dockerContainer branch November 30, 2024 07:40
@qgis-bot
Copy link
Collaborator

The backport to release_3.34 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 8de6872624... Update docker container formatting
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 release_process.md
CONFLICT (content): Merge conflict in release_process.md

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

Then, create a pull request where the base branch is release_3.34 and the compare/head branch is backport-9435-to-release_3.34.

@qgis-bot
Copy link
Collaborator

The backport to release_3.40 failed:

The process '/usr/bin/git' failed with exit code 128
stderr
error: commit 9e21aa7c51266d6d1397febbec2e6563108c9add is a merge but no -m option was given.
fatal: cherry-pick failed

stdout
[backport-9435-to-release_3.40 af9f4bcfb8] Update docker container formatting
 Author: Harrissou Sant-anna <[email protected]>
 Date: Sat Nov 30 06:59:20 2024 +0000
 1 file changed, 1 insertion(+), 1 deletion(-)

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

Then, create a pull request where the base branch is release_3.40 and the compare/head branch is backport-9435-to-release_3.40.

@DelazJ
Copy link
Collaborator Author

DelazJ commented Nov 30, 2024

Manually and directly backported with ac1b6dc and 1dc2533

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backend backport release_3.34 On merge create a backported pull request to 3.34 backport release_3.40 On merge create a backported pull request to 3.40
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants