Skip to content

Fix auto concurrency cancellation skips commit status updates #33764

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
Merged
merged 3 commits into from
Mar 10, 2025
Merged

Fix auto concurrency cancellation skips commit status updates #33764

merged 3 commits into from
Mar 10, 2025

Conversation

ChristopherHX
Copy link
Contributor

@ChristopherHX ChristopherHX commented Mar 1, 2025 •
edited
Loading

  • add missing commit status
  • conflicts with concurrency support

Closes #33763

@ChristopherHX
Fix auto concurrency cancellation skips commit status updates
8e3659f 
* add missing commit status
* conflicts with concurrency support
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 1, 2025
@github-actions github-actions bot added modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code labels Mar 1, 2025
@ChristopherHX ChristopherHX mentioned this pull request Mar 1, 2025
Open
@lunny lunny requested a review from Zettat123 March 2, 2025 02:28
@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 Mar 2, 2025
@lunny lunny added type/bug backport/v1.23 This PR should be backported to Gitea 1.23 labels Mar 2, 2025
@lunny lunny mentioned this pull request Mar 3, 2025
Merged
lunny added a commit that referenced this pull request Mar 4, 2025
@lunny @metiftikci
Add changelog for 1.23.5 (#33780)
9c3511f 
Wait tomorrow's Golang version.
Maybe wait backport of #33764 and #33744, #33789

---------

Co-authored-by: metiftikci <[email protected]>
@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 Mar 10, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 10, 2025
@ChristopherHX ChristopherHX mentioned this pull request Mar 10, 2025
Merged
@GiteaBot
Copy link
Collaborator

@ChristopherHX please fix the merge conflicts. 🍵

@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 10, 2025
@ChristopherHX
Copy link
Contributor Author

I have trouble to find the "conflict", gitea bot did a merge already without failure

@ChristopherHX please fix the merge conflicts. 🍵

@lunny lunny merged commit a92d5f6 into go-gitea:main Mar 10, 2025
26 checks passed
@GiteaBot GiteaBot added this to the 1.24.0 milestone Mar 10, 2025
@GiteaBot
Copy link
Collaborator

I was unable to create a backport for 1.23. @ChristopherHX, please send one manually. 🍵

go run ./contrib/backport 33764
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Mar 10, 2025
ChristopherHX added a commit to ChristopherHX/gitea that referenced this pull request Mar 10, 2025
@ChristopherHX
Fix auto concurrency cancellation skips commit status updates (go-git…
3f451b0 
…ea#33764)

Backport go-gitea#33764
* add missing commit status
* conflicts with concurrency support
@ChristopherHX ChristopherHX mentioned this pull request Mar 10, 2025
Merged
lunny pushed a commit that referenced this pull request Mar 11, 2025
@ChristopherHX
Fix auto concurrency cancellation skips commit status updates (#33764) (
fc82204 
#33849)

Backport #33764
* add missing commit status
* conflicts with concurrency support
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 12, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
62e84f3 
* giteaofficial/main:
  Fix various Fomantic UI and htmx problems (go-gitea#33851)
  Add workflow_job webhook (go-gitea#33694)
  Fix file icon mapping (go-gitea#33855)
  Drop fomantic build (go-gitea#33845)
  Fix auto concurrency cancellation skips commit status updates (go-gitea#33764)
  Fix test code (go-gitea#33829)
  Remove "noscript" tag from html head (go-gitea#33846)
  Fix material icon & diff highlight (go-gitea#33844)
  Fix LFS URL (go-gitea#33840)
  Add material icons for file list (go-gitea#33837)
@lunny lunny added the backport/done All backports for this PR have been created label Mar 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lunny lunny lunny approved these changes

@Zettat123 Zettat123 Zettat123 approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.23 This PR should be backported to Gitea 1.23 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 type/bug
Projects
None yet
Milestone
1.24.0
Development

Successfully merging this pull request may close these issues.

Auto Concurrency CancelPreviousJobs does not update the commit status to cancelled
4 participants
@ChristopherHX @GiteaBot @lunny @Zettat123