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

update BSDmakefile to latest version from upstream #24063

Merged
merged 4 commits into from
Apr 12, 2023
Merged

update BSDmakefile to latest version from upstream #24063

merged 4 commits into from
Apr 12, 2023

Conversation

techknowlogick
Copy link
Member

@techknowlogick techknowlogick added topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Apr 11, 2023
@techknowlogick techknowlogick added this to the 1.20.0 milestone Apr 11, 2023
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Apr 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 Apr 11, 2023
@yardenshoham yardenshoham added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 11, 2023
6543
6543 reviewed Apr 11, 2023
View reviewed changes
BSDmakefile Outdated Show resolved Hide resolved
@codecov-commenter
Copy link

codecov-commenter commented Apr 11, 2023 •
edited
Loading

Codecov Report

Merging #24063 (d381565) into main (f521e88) will decrease coverage by 0.11%.
The diff coverage is 31.54%.

❗ Current head d381565 differs from pull request most recent head 5ea1d08. Consider uploading reports for the commit 5ea1d08 to get more accurate results

@@            Coverage Diff             @@
##             main   #24063      +/-   ##
==========================================
- Coverage   47.14%   47.03%   -0.11%     
==========================================
  Files        1149     1163      +14     
  Lines      151446   153669    +2223     
==========================================
+ Hits        71397    72285     +888     
- Misses      71611    72872    +1261     
- Partials     8438     8512      +74
Impacted Files Coverage Δ
cmd/dump.go 0.64% <0.00%> (-0.03%) ⬇️
cmd/mailer.go 0.00% <0.00%> (ø)
cmd/manager.go 0.00% <0.00%> (ø)
cmd/manager_logging.go 0.00% <0.00%> (ø)
cmd/migrate_storage.go 5.76% <0.00%> (-0.12%) ⬇️
cmd/restore_repo.go 0.00% <0.00%> (ø)
cmd/web.go 0.00% <0.00%> (ø)
models/actions/run.go 1.63% <0.00%> (-0.10%) ⬇️
models/actions/runner.go 1.44% <ø> (ø)
models/organization/org_user.go 80.51% <0.00%> (-12.02%) ⬇️
... and 61 more

... and 124 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@techknowlogick techknowlogick enabled auto-merge (squash) April 12, 2023 01:15
@techknowlogick techknowlogick merged commit 8aada18 into go-gitea:main Apr 12, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 12, 2023
@techknowlogick techknowlogick deleted the update-bsdmakefie branch April 12, 2023 05:21
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 13, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
a3da958 
* upstream/main:
  [skip ci] Updated translations via Crowdin
  Bump vm2 from 3.9.15 to 3.9.16 (go-gitea#24089)
  Fix difficult translation for other languages (go-gitea#24070)
  Fix mismatch between hook events and github event types (go-gitea#24048)
  Improve LFS error logs (go-gitea#24072)
  Update the value of the `diffEnd` when click `Show More` btn in the DiffFileTree (go-gitea#24069)
  Add tooltips to `Hide comment type` settings where necessary (go-gitea#21306)
  Use a general approach to access custom/static/builtin assets (go-gitea#24022)
  Make Release Download URLs predictable (go-gitea#23891)
  Expand selected file when clicking file tree (go-gitea#24041)
  Localize milestone related time strings (go-gitea#24051)
  update BSDmakefile to latest version from upstream (go-gitea#24063)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 31, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@6543 6543 6543 left review comments

@lafriks lafriks lafriks approved these changes

@yardenshoham yardenshoham yardenshoham approved these changes

@delvh delvh delvh 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. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile
Projects
None yet
Milestone
1.20.0
Development

Successfully merging this pull request may close these issues.
7 participants
@techknowlogick @codecov-commenter @lafriks @yardenshoham @6543 @delvh @GiteaBot