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

Address minor portability issues #9414

Merged
merged 3 commits into from
Dec 18, 2019
Merged

Address minor portability issues #9414

merged 3 commits into from
Dec 18, 2019

Conversation

dankm
Copy link
Contributor

@dankm dankm commented Dec 18, 2019

Address some minor annoyances when building on FreeBSD (and possibly other systems):

Use $(MAKE) instead of "make" when determining the GNU Make version
Add OS specific sed for FreeBSD

Makefile Outdated Show resolved Hide resolved
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 18, 2019
@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 Dec 18, 2019
Makefile Outdated Show resolved Hide resolved
@codecov-io
Copy link

codecov-io commented Dec 18, 2019

Codecov Report

Merging #9414 into master will decrease coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #9414      +/-   ##
==========================================
- Coverage   41.51%   41.48%   -0.03%     
==========================================
  Files         569      569              
  Lines       74322    74322              
==========================================
- Hits        30855    30835      -20     
- Misses      39627    39646      +19     
- Partials     3840     3841       +1
Impacted Files Coverage Δ
services/pull/check.go 48.59% <0%> (-10.57%) ⬇️
modules/indexer/code/indexer.go 44.73% <0%> (-10.53%) ⬇️
modules/repository/repo.go 33.55% <0%> (-1.98%) ⬇️
modules/migrations/migrate.go 24.21% <0%> (-1.58%) ⬇️
models/webhook.go 69.39% <0%> (-1.07%) ⬇️
models/repo_list.go 73.14% <0%> (-0.93%) ⬇️
modules/migrations/gitea.go 9.03% <0%> (-0.64%) ⬇️
models/repo.go 48.2% <0%> (+0.1%) ⬆️
models/error.go 33.2% <0%> (+1.11%) ⬆️
modules/task/migrate.go 28.94% <0%> (+3.94%) ⬆️
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1b8a919...2bdcff8. Read the comment docs.

@lafriks lafriks added the topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile label Dec 18, 2019
Some systems don't use GNU make by default, and use something like
gnumake or gmake. Respect that when determining the make version.
@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 Dec 18, 2019
@techknowlogick techknowlogick merged commit d66ae50 into go-gitea:master Dec 18, 2019
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
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. topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants