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.

Sign up for GitHub

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

Jump to bottom

Upgrade to Node 20 on CI, enable actions cancellation #24524

Merged
merged 10 commits into from May 4, 2023
Merged

Upgrade to Node 20 on CI, enable actions cancellation #24524

merged 10 commits into from May 4, 2023

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented May 4, 2023 •
edited

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 4, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label May 4, 2023
@silverwind silverwind added dependencies and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 4, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label May 4, 2023
@techknowlogick techknowlogick added this to the 1.20.0 milestone May 4, 2023
techknowlogick
techknowlogick approved these changes May 4, 2023
View reviewed changes
Copy link
Member

@techknowlogick techknowlogick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks :)

If you want to get the concurrency changes in here too, otherwise I can get another PR for them.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 4, 2023
@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 4, 2023
@silverwind
Copy link
Member Author

LGTM, thanks :)

If you want to get the concurrency changes in here too, otherwise I can get another PR for them.

Added the concurrency group to all pull-* pipelines. See here for the description of github.ref. So it should now cancel previous runs in the same concurrency group. I will test with a push now.

@silverwind
Copy link
Member Author

silverwind commented May 4, 2023 •
edited

Cancelling seems to work fine, but the "X" icon surprises me a bit as I would have expected an icon different from a failure. Also I wonder why giteabot is still pending on the cancelled build.

@silverwind
Copy link
Member Author

Maybe the icon would go to a grey stop sign if all steps in the build are cancelled, but I don't know how to cancel giteabot 😆.

@techknowlogick
Copy link
Member

Also I wonder why giteabot is still pending on the cancelled build.

Giteabot won't go grey, it'll stay "pending" until the PR receives all approvals.

@techknowlogick
Copy link
Member

I'm not sure if you are seeing this too, but in the required checks area below there are duplicated checks. Perhaps the concurrency stuff is indeed best saved for another PR so as to not hold this one up. Sorry for the extra work you have done.

@silverwind
Copy link
Member Author

Hmm I don't see duplicates but there are "6 successful, 8 expected" and the expected ones do not run, strange.

@silverwind
Copy link
Member Author

Trying this now: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow

@silverwind silverwind changed the title Upgrade to Node 20 on CI Upgrade to Node 20 on CI, enable actions concurrency feature May 4, 2023
@silverwind silverwind changed the title Upgrade to Node 20 on CI, enable actions concurrency feature Upgrade to Node 20 on CI, enable actions concurrency May 4, 2023
@techknowlogick
Copy link
Member

Ah yup, I'm not seeing any dupes anymore. What you have done has worked :)

@silverwind
Copy link
Member Author

silverwind commented May 4, 2023 •
edited

There is one more variation of this cancelling which can be configured so that only pull requests cancel, release builds and main branch builds won't cancel. I'll copy the syntax that node uses.

@silverwind
Copy link
Member Author

Done, this new cancellation will only cancel on pull requests. I see the workflows currently only run on: pull_request, but should we ever decide to run them on main branch, this syntax will be good to have.

@silverwind silverwind changed the title Upgrade to Node 20 on CI, enable actions concurrency Upgrade to Node 20 on CI, enable actions cancellation May 4, 2023
@silverwind silverwind added the topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile label May 4, 2023
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 4, 2023
@yardenshoham yardenshoham added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 4, 2023
@silverwind silverwind enabled auto-merge (squash) May 4, 2023 22:21
@silverwind silverwind merged commit 0ca1958 into go-gitea:main May 4, 2023
15 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 4, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 5, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
43987ed 
* upstream/main:
  Harmonize title formatting in `docs/content/doc/development/api-usage.en-us.md` (go-gitea#24529)
  automate locking closed threads (go-gitea#24525)
  [skip ci] Updated translations via Crowdin
  Display warning when user try to rename default branch (go-gitea#24512)
  Upgrade to Node 20 on CI, enable actions cancellation (go-gitea#24524)
  Fix incorrectly quoted translation (go-gitea#24514)
  Fix color for transfer related buttons when having no permission to act (go-gitea#24510)
  Fix some mistakes when using `ignSignIn` (go-gitea#24415)
  Remove unused zapx replace statement on go.mod (go-gitea#24515)
  Don't display creating page button in a mirror wiki repository (go-gitea#24395)
  Improve template system and panic recovery (go-gitea#24461)
  Faster git.GetDivergingCommits (go-gitea#24482)
  Merge setting.InitXXX into one function with options (go-gitea#24389)
@silverwind silverwind deleted the node20 branch May 5, 2023 13:09
@silverwind silverwind mentioned this pull request May 29, 2023
Merged
silverwind added a commit that referenced this pull request May 29, 2023
@silverwind
Upgrade snap to node 20 (#24990)
51b1308 
Followup to #24524. Now there is a
[node 20 snap](https://snapcraft.io/node), so let's upgrade to it.
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@techknowlogick techknowlogick techknowlogick approved these changes

@yardenshoham yardenshoham yardenshoham approved these changes

@delvh delvh delvh approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile
Projects
None yet
Milestone
1.20.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@silverwind @techknowlogick @yardenshoham @delvh @GiteaBot