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 Github Actions runner images #8660

Merged
merged 1 commit into from
Feb 13, 2025

Conversation

juanluisrp
Copy link
Contributor

@juanluisrp juanluisrp commented Feb 13, 2025

Ubuntu 20.04 will become unsupported on 2025-04. Update the images used in the Github Actions runners to one supported.

Checklist

  • I have read the contribution guidelines
  • Pull request provided for main branch, backports managed with label
  • Good housekeeping of code, cleaning up comments, tests, and documentation
  • Clean commit history broken into understandable chucks, avoiding big commits with hundreds of files, cautious of reformatting and whitespace changes
  • Clean commit messages, longer verbose messages are encouraged
  • API Changes are identified in commit messages
  • Testing provided for features or enhancements using automatic tests
  • User documentation provided for new features or enhancements in manual
  • Build documentation provided for development instructions in README.md files
  • Library management using pom.xml dependency management. Update build documentation with intended library use and library tutorials or documentation

Ubuntu 20.04 will become unsupported on 2025-04. Update the images used
in the Github Actions runners to one supported.
@juanluisrp juanluisrp added github_actions Pull requests that update GitHub Actions code backport 4.2.x backport 4.0.x backport 3.12.x labels Feb 13, 2025
@juanluisrp juanluisrp merged commit 711f9f2 into main Feb 13, 2025
15 checks passed
@geonetworkbuild
Copy link
Collaborator

The backport to 3.12.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 4f3ba89bee... Update Github Actions runner images
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
CONFLICT (modify/delete): .github/workflows/backport.yml deleted in HEAD and modified in 4f3ba89bee (Update Github Actions runner images).  Version 4f3ba89bee (Update Github Actions runner images) of .github/workflows/backport.yml left in tree.
Auto-merging .github/workflows/linux.yml
CONFLICT (content): Merge conflict in .github/workflows/linux.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-3.12.x 3.12.x
# Navigate to the new working tree
cd .worktrees/backport-3.12.x
# Create a new branch
git switch --create backport-8660-to-3.12.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 4f3ba89bee0525b7cd5b4f30f492959dfbcf456a
# Push it to GitHub
git push --set-upstream origin backport-8660-to-3.12.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-3.12.x

Then, create a pull request where the base branch is 3.12.x and the compare/head branch is backport-8660-to-3.12.x.

@geonetworkbuild
Copy link
Collaborator

The backport to 4.0.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 4f3ba89bee... Update Github Actions runner images
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
CONFLICT (modify/delete): .github/workflows/backport.yml deleted in HEAD and modified in 4f3ba89bee (Update Github Actions runner images).  Version 4f3ba89bee (Update Github Actions runner images) of .github/workflows/backport.yml left in tree.
Auto-merging .github/workflows/linux.yml
CONFLICT (content): Merge conflict in .github/workflows/linux.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-4.0.x 4.0.x
# Navigate to the new working tree
cd .worktrees/backport-4.0.x
# Create a new branch
git switch --create backport-8660-to-4.0.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 4f3ba89bee0525b7cd5b4f30f492959dfbcf456a
# Push it to GitHub
git push --set-upstream origin backport-8660-to-4.0.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.0.x

Then, create a pull request where the base branch is 4.0.x and the compare/head branch is backport-8660-to-4.0.x.

@geonetworkbuild
Copy link
Collaborator

The backport to 4.2.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 4f3ba89bee... Update Github Actions runner images
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
CONFLICT (modify/delete): .github/workflows/backport.yml deleted in HEAD and modified in 4f3ba89bee (Update Github Actions runner images).  Version 4f3ba89bee (Update Github Actions runner images) of .github/workflows/backport.yml left in tree.
Auto-merging .github/workflows/linux.yml
CONFLICT (content): Merge conflict in .github/workflows/linux.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-4.2.x 4.2.x
# Navigate to the new working tree
cd .worktrees/backport-4.2.x
# Create a new branch
git switch --create backport-8660-to-4.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 4f3ba89bee0525b7cd5b4f30f492959dfbcf456a
# Push it to GitHub
git push --set-upstream origin backport-8660-to-4.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.2.x

Then, create a pull request where the base branch is 4.2.x and the compare/head branch is backport-8660-to-4.2.x.

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