Skip to content

Conversation

@Zettat123
Copy link
Contributor

@Zettat123 Zettat123 commented Dec 7, 2024

Fix #24769
Fix #32662
Fix #33260

Depends on https://gitea.com/gitea/act/pulls/124

⚠️ BREAKING ⚠️

This PR removes the auto-cancellation feature added by #25716. Users need to manually add concurrency to workflows to control concurrent workflows or jobs.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 7, 2024
@github-actions github-actions bot added modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code modifies/migrations modifies/dependencies labels Dec 7, 2024
@Zettat123 Zettat123 force-pushed the support-actions-concurrency branch from 3551677 to fcf4517 Compare December 10, 2024 08:56
@lunny lunny added this to the 1.24.0 milestone Dec 16, 2024
@Zettat123 Zettat123 force-pushed the support-actions-concurrency branch from 52833e7 to 130f2a2 Compare December 17, 2024 01:49
@Zettat123 Zettat123 force-pushed the support-actions-concurrency branch 3 times, most recently from 461c7c1 to d5168a2 Compare January 6, 2025 06:16
@Zettat123 Zettat123 force-pushed the support-actions-concurrency branch from e038ed2 to f77f266 Compare January 10, 2025 06:00
@Zettat123 Zettat123 changed the title WIP: Support concurrency for Actions WIP: Support Actions concurrency syntax Jan 15, 2025
@Zettat123 Zettat123 force-pushed the support-actions-concurrency branch from ad71599 to 8f5948b Compare January 15, 2025 03:03
@Zettat123

This comment was marked as resolved.

wxiaoguang added a commit that referenced this pull request Jan 15, 2025
)

Move the main logic of `generateTaskContext` and `findTaskNeeds` to the
`services` layer.

This is a part of #32751, since we need the git context and `needs` to
parse the concurrency expressions.

---------

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@wxiaoguang wxiaoguang added the type/feature Completely new functionality. Can only be merged if feature freeze is not active. label Oct 10, 2025
@wxiaoguang
Copy link
Contributor

I have no more questions. If the new changes look good, feel free to merge. Thank you all.

@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 10, 2025
@lunny lunny enabled auto-merge (squash) October 10, 2025 18:48
@lunny lunny merged commit 40f71bc into go-gitea:main Oct 10, 2025
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 10, 2025
@wxiaoguang wxiaoguang deleted the support-actions-concurrency branch October 11, 2025 00:47
zjjhot added a commit to zjjhot/gitea that referenced this pull request Oct 13, 2025
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Update JS deps, misc tweaks (go-gitea#35643)
  Bump actions/checkout to v5 (go-gitea#35644)
  nix flake update (go-gitea#35639)
  Cleanup ActionRun creation (go-gitea#35624)
  bump archives&rar dep (go-gitea#35637)
  Fix merge panic (go-gitea#35606)
  Bump happy-dom from 19.0.2 to 20.0.0 (go-gitea#35625)
  Refactor ActionRunJob parsing into a reusable function (go-gitea#35623)
  Fix code tag style problem and LFS view bug (go-gitea#35628)
  Support Actions `concurrency` syntax (go-gitea#32751)
  The status icon of the Action step is consistent with GitHub (go-gitea#35618)
  Mock external service in hcaptcha TestCaptcha (go-gitea#35604)
  Fix inputing review comment will remove reviewer (go-gitea#35591)
  [skip ci] Updated translations via Crowdin
  Fix diffpatch API endpoint (go-gitea#35610)
  Print PR-Title into tooltip for actions (go-gitea#35579)
@Clindbergh
Copy link

@lunny Are there any considerations to backport this PR to 1.25 ? Thanks.

@ChristopherHX
Copy link
Contributor

IMO This is too large for backporting and changes the database structure

@Clindbergh
Copy link

IMO This is too large for backporting and changes the database structure

Thanks for the response.

Did 1.25.1 or earlier versions introduce any other setting or feature that would enable new workarounds to avoid ongoing pipelines being cancelled by new pushes? Ideally the jobs would queue, the concurrency syntax feature is secondary to me.

@wxiaoguang
Copy link
Contributor

1.25 won't get large changes.

I think you can use the main-nightly, it should be stable enough for daily usage. And any bug will be fixed in first time.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code modifies/migrations pr/breaking Merging this PR means builds will break. Needs a description what exactly breaks, and how to fix it! type/feature Completely new functionality. Can only be merged if feature freeze is not active.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

workflow_dispatch allows only one job in a branch [Actions] Opt-out from auto-cancellation [Actions] Support concurrency syntax

10 participants