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 basic github actions #1164

Merged
merged 1 commit into from
Sep 27, 2023
Merged

Update basic github actions #1164

merged 1 commit into from
Sep 27, 2023

Conversation

aaime
Copy link
Member

@aaime aaime commented Sep 27, 2023

I'm noticing jobs that are sitting there for hours without a worker being assigned, along with warnings that we are using outdated actions:

The following actions uses node12 which is deprecated and will be forced to run on node16: actions/checkout@v2, actions/setup-java@v1, actions/cache@v1. For more info: https://github.blog/changelog/2023-06-13-github-actions-all-actions-will-run-on-node16-instead-of-node12-by-default/

I'm assuming it's a brownout to remind us of upgrading. Let's see if these new versions work fine.

@aaime aaime merged commit 47148d3 into GeoWebCache:main Sep 27, 2023
6 checks passed
@aaime
Copy link
Member Author

aaime commented Sep 27, 2023

The backport to 1.22.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply d634a5af... Update basic github actions
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".

stdout
Auto-merging .github/workflows/integration.yml
CONFLICT (content): Merge conflict in .github/workflows/integration.yml
Auto-merging .github/workflows/linux.yml
CONFLICT (content): Merge conflict in .github/workflows/linux.yml
Auto-merging .github/workflows/macos.yml
CONFLICT (content): Merge conflict in .github/workflows/macos.yml
Auto-merging .github/workflows/windows.yml
CONFLICT (content): Merge conflict in .github/workflows/windows.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-1.22.x 1.22.x
# Navigate to the new working tree
cd .worktrees/backport-1.22.x
# Create a new branch
git switch --create backport-1164-to-1.22.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick d634a5afeabad02968f1453b2c0ff2daf15b9503
# Push it to GitHub
git push --set-upstream origin backport-1164-to-1.22.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.22.x

Then, create a pull request where the base branch is 1.22.x and the compare/head branch is backport-1164-to-1.22.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.

1 participant