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

Do not publish docker release images on -dev tags #25471

Merged
merged 4 commits into from Jun 23, 2023
Merged

Do not publish docker release images on -dev tags #25471

merged 4 commits into from Jun 23, 2023

Conversation

delvh
Copy link
Member

@delvh delvh commented Jun 23, 2023

Try to prevent what happened with tag v1.21.0-dev as outlined in #25193.
Unfortunately, we cannot really test if it works as intended as we would need to release a new dev tag for that.
Fixes #25193 (or at least attempts to).

@delvh delvh added type/bug topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile labels Jun 23, 2023
@delvh delvh added this to the 1.21.0 milestone Jun 23, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 23, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 23, 2023
@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 Jun 23, 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 Jun 23, 2023
@techknowlogick techknowlogick enabled auto-merge (squash) June 23, 2023 18:02
@jolheiser
Copy link
Member

I don't think raymond understands or.

@delvh delvh disabled auto-merge June 23, 2023 18:44
@jolheiser
Copy link
Member

https://go.dev/play/p/Hg-GtByHgri

Even worse, it doesn't even choke, it just happily accepts random input.
https://go.dev/play/p/no6T_yrD5JC

@delvh
Copy link
Member Author

delvh commented Jun 23, 2023

I don't know if it does or doesn't.
As I said, I can't test it, so this PR is a shot in the dark.
If it doesn't support that, then how exactly are we supposed to check for two conditions?

@jolheiser
Copy link
Member

jolheiser commented Jun 23, 2023 •
edited

If it doesn't support that, then how exactly are we supposed to check for two conditions?

Apparently nesting ☹️
https://go.dev/play/p/LXy1klCnwXz

I can't make a code suggestion since it would go beyond the diff, but essentially we need another unless block.

@delvh @jolheiser
Nest unless checks instead of using or :/
f6214dd 
Co-authored-by: jolheiser <john.olheiser@gmail.com>
jolheiser
jolheiser reviewed Jun 23, 2023
View reviewed changes
Copy link
Member

@jolheiser jolheiser left a comment

Choose a reason for hiding this comment

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

My bad, I had shortened the variables in my examples as I wrote them hastily 😅

docker/manifest.rootless.tmpl Outdated Show resolved Hide resolved
docker/manifest.tmpl Outdated Show resolved Hide resolved
@delvh @jolheiser
Fix typos
aa62528 
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
@delvh delvh added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 23, 2023
@delvh delvh enabled auto-merge (squash) June 23, 2023 19:02
@yardenshoham yardenshoham added reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Jun 23, 2023
@delvh delvh merged commit 65ba2f3 into go-gitea:main Jun 23, 2023
21 of 23 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 23, 2023
@delvh delvh deleted the bugfix/do-not-push-dev-versions branch July 1, 2023 09:09
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 21, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@silverwind silverwind silverwind approved these changes

@techknowlogick techknowlogick techknowlogick approved these changes

@jolheiser jolheiser jolheiser 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile type/bug
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.

latest tag being bind to the wrong Docker image
6 participants
@delvh @jolheiser @silverwind @techknowlogick @yardenshoham @GiteaBot