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

Only run docker-dryrun when necessary #25329

Merged
merged 20 commits into from
Jun 19, 2023
Merged

Only run docker-dryrun when necessary #25329

merged 20 commits into from
Jun 19, 2023

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented Jun 18, 2023 •
edited
Loading

docker-dryrun runs on almost any PR, which is a huge waste of CI resources. Run it only when the Dockerfiles change and also add a step that verifies the rootless file.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 18, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 18, 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 Jun 18, 2023
@silverwind silverwind added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Jun 18, 2023
@pull-request-size pull-request-size bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 18, 2023
@lunny
Copy link
Member

lunny commented Jun 18, 2023

docker-dryrun runs on almost any PR, which is a huge waste of CI resources. Run it only when the Dockerfiles change and also add a step that verifies the rootless file.

I don't think it's right. Backend code changes will also affect the docker dryrun?

@silverwind
Copy link
Member Author

silverwind commented Jun 18, 2023 •
edited
Loading

docker-dryrun runs on almost any PR, which is a huge waste of CI resources. Run it only when the Dockerfiles change and also add a step that verifies the rootless file.

I don't think it's right. Backend code changes will also affect the docker dryrun?

Backend build is already verified by its dedicated workflow steps, no need to verify it multiple times in the same run.

@silverwind
Copy link
Member Author

silverwind commented Jun 18, 2023 •
edited
Loading

I guess there is a slight chance in case docker build breaks because of breaking changes in the docker build tooling that we won't notice it in PR validation, but it will be noticed on other docker builds on the main branch, and in fact such a breakage would not be related to said PR.

@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 18, 2023
@techknowlogick techknowlogick added the backport/v1.20 This PR should be backported to Gitea 1.20 label Jun 18, 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 18, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 18, 2023
@techknowlogick techknowlogick enabled auto-merge (squash) June 18, 2023 03:45
@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 Jun 18, 2023
@silverwind
Copy link
Member Author

Detect step names shortened:

image

@silverwind
Copy link
Member Author

Need an admin merge here I assume, this docker-dryrun check is not responding, but it's not the GitHub check, but some legacy drone one I assume.

image

@silverwind silverwind removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 18, 2023
@silverwind
Copy link
Member Author

Removing from merge queue as it won't merge automatically.

@lunny lunny disabled auto-merge June 19, 2023 01:44
@pull-request-size pull-request-size bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 19, 2023
@techknowlogick
Copy link
Member

dry run removed from required checks, and conflicts resolved.

@techknowlogick techknowlogick merged commit 51c2aeb into go-gitea:main Jun 19, 2023
@GiteaBot
Copy link
Contributor

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

go run ./contrib/backport 25329
...  // 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 Jun 19, 2023
@techknowlogick techknowlogick removed backport/manual No power to the bots! Create your backport yourself! backport/v1.20 This PR should be backported to Gitea 1.20 labels Jun 19, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jun 19, 2023
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
5eceb8d 
* giteaofficial/main: (22 commits)
  Only run `docker-dryrun` when necessary (go-gitea#25329)
  fix a nit error output in Makefile (go-gitea#25360)
  [skip ci] Updated translations via Crowdin
  Clean up pyproject.toml and package.json, fix poetry options (go-gitea#25327)
  Fix label list divider (go-gitea#25312)
  Avoid polluting the config (go-gitea#25345)
  Fix incorrect link-action event target (go-gitea#25306)
  Write absolute AppDataPath to app.ini when installing (go-gitea#25331)
  Add Exoscale to installation on cloud provider docs (go-gitea#25342)
  Fix UI on mobile view (go-gitea#25315)
  When viewing a file, hide the add button (go-gitea#25320)
  Update JS dependencies, remove space after emoji completion (go-gitea#25266)
  Refactor web package and context package (go-gitea#25298)
  build nightly docker images (go-gitea#25317)
  Add `stylelint-declaration-block-no-ignored-properties` (go-gitea#25284)
  Remove EasyMDE focus outline on text (go-gitea#25328)
  use Actions environment variables in Makefile (go-gitea#25319)
  add `stylelint-stylistic` (go-gitea#25285)
  Remove more unused Fomantic variants (go-gitea#25292)
  Build nightly binaries with Actions (go-gitea#25308)
  ...
@silverwind silverwind deleted the nodry branch June 19, 2023 07:44
@silverwind silverwind mentioned this pull request Jun 19, 2023
Merged
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 17, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@delvh delvh delvh approved these changes

@techknowlogick techknowlogick techknowlogick approved these changes

@lunny lunny lunny 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/S Denotes a PR that changes 10-29 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@silverwind @lunny @techknowlogick @GiteaBot @delvh