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

Revert "Simplify contrib/backport (#27520)" #27566

Merged

Conversation

zeripath
Copy link
Contributor

This reverts #27520 commit 79e8865 which breaks --continue functionality.

This reverts go-gitea#27520 commit 79e8865
which breaks `--continue` functionality.
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 10, 2023
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 10, 2023
@lunny
Copy link
Member

lunny commented Oct 10, 2023

Can we fix it but revert it?

@silverwind
Copy link
Member

I can fix it later. This script has likely never seen any usage as otherwise people would have noticed to update the default v1.18 version. As we now regularily backport to multiple versions, the version must be a required argument.

@delvh
Copy link
Member

delvh commented Oct 10, 2023

Hmm… I'm somewhat against simply reverting it.
I'm more in favor of fixing it as per @lunny and @silverwind

@silverwind
Copy link
Member

silverwind commented Oct 11, 2023

Actually I think it's probably easier to revert now, and then follow up with a reduced version of #27520 again, so let's merge this first.

The script is semi-broken either before or after this, so it need fixing anyways.

@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 Oct 11, 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 Oct 11, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 11, 2023
@lunny lunny enabled auto-merge (squash) October 11, 2023 05:25
@lunny lunny merged commit 4378f9d into go-gitea:main Oct 11, 2023
25 checks passed
@GiteaBot GiteaBot added this to the 1.22.0 milestone Oct 11, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 11, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Oct 12, 2023
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Keep filter when showing unfiltered results on explore page (go-gitea#27192)
  Don't show Link to TOTP if not set up (go-gitea#27585)
  Fix data-race bug when accessing task.LastRun (go-gitea#27584)
  Fix template bug (go-gitea#27581)
  Replace ajax with fetch, improve image diff (go-gitea#27267)
  Replace assert.Fail with assert.FailNow (go-gitea#27578)
  Fix the robots.txt path
  show manual cron run's last time (go-gitea#27544)
  fully replace drone with actions (go-gitea#27556)
  Revert "Simplify `contrib/backport` (go-gitea#27520)" (go-gitea#27566)
  Align ISSUE_TEMPLATE with the new label system (go-gitea#27573)
  Penultimate round of `db.DefaultContext` refactor (go-gitea#27414)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jan 9, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants