core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use `gitea/test_env` image instead of `golang` (#23455) 

The `safe.directory` setting was not executed for pull requests, which
made subsequent `deps-backend` target fail at `go mod download`. To fix
it, split thep and perform the git config unconditionally.

Example: https://drone.gitea.io/go-gitea/gitea/69477/4/3

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
silverwind 2023-03-15 02:53:14 +01:00 committed by GitHub
parent f96eef872f
commit ea1b92621b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
.drone.yml
View File

@ -26,7 +26,7 @@ steps:
- make deps-frontend - make deps-frontend
- name: deps-backend - name: deps-backend
image: golang:1.20 image: gitea/test_env:linux-1.20-amd64
pull: always pull: always
commands: commands:
- make deps-backend - make deps-backend
@ -90,7 +90,7 @@ steps:
depends_on: [deps-frontend] depends_on: [deps-frontend]
- name: checks-backend - name: checks-backend
image: golang:1.20 image: gitea/test_env:linux-1.20-amd64
commands: commands:
- make --always-make checks-backend # ensure the 'go-licenses' make target runs - make --always-make checks-backend # ensure the 'go-licenses' make target runs
depends_on: [deps-backend] depends_on: [deps-backend]
@ -111,7 +111,7 @@ steps:
depends_on: [deps-frontend] depends_on: [deps-frontend]
- name: build-backend-no-gcc - name: build-backend-no-gcc
image: golang:1.19 # this step is kept as the lowest version of golang that we support image: gitea/test_env:linux-1.19-amd64 # this step is kept as the lowest version of golang that we support
pull: always pull: always
environment: environment:
GOPROXY: https://goproxy.io GOPROXY: https://goproxy.io
@ -123,7 +123,7 @@ steps:
path: /go path: /go
- name: build-backend-arm64 - name: build-backend-arm64
image: golang:1.20 image: gitea/test_env:linux-1.20-amd64
environment: environment:
GOPROXY: https://goproxy.io GOPROXY: https://goproxy.io
GOOS: linux GOOS: linux
@ -138,7 +138,7 @@ steps:
path: /go path: /go
- name: build-backend-windows - name: build-backend-windows
image: golang:1.20 image: gitea/test_env:linux-1.20-amd64
environment: environment:
GOPROXY: https://goproxy.io GOPROXY: https://goproxy.io
GOOS: windows GOOS: windows
@ -152,7 +152,7 @@ steps:
path: /go path: /go
- name: build-backend-386 - name: build-backend-386
image: golang:1.20 image: gitea/test_env:linux-1.20-amd64
environment: environment:
GOPROXY: https://goproxy.io GOPROXY: https://goproxy.io
GOOS: linux GOOS: linux
@ -213,7 +213,6 @@ steps:
image: docker:git image: docker:git
pull: always pull: always
commands: commands:
- git config --global --add safe.directory /drone/src
- git fetch --tags --force - git fetch --tags --force
when: when:
event: event:
@ -221,7 +220,7 @@ steps:
- pull_request - pull_request
- name: deps-backend - name: deps-backend
image: golang:1.20 image: gitea/test_env:linux-1.20-amd64
pull: always pull: always
commands: commands:
- make deps-backend - make deps-backend
@ -313,7 +312,6 @@ steps:
image: docker:git image: docker:git
pull: always pull: always
commands: commands:
- git config --global --add safe.directory /drone/src
- git fetch --tags --force - git fetch --tags --force
when: when:
event: event:
@ -321,7 +319,7 @@ steps:
- pull_request - pull_request
- name: deps-backend - name: deps-backend
image: golang:1.20 image: gitea/test_env:linux-1.20-amd64
pull: always pull: always
commands: commands:
- make deps-backend - make deps-backend
@ -399,7 +397,7 @@ steps:
path: /go path: /go
- name: generate-coverage - name: generate-coverage
image: golang:1.20 image: gitea/test_env:linux-1.20-amd64
commands: commands:
- make coverage - make coverage
environment: environment:
@ -465,7 +463,6 @@ steps:
image: docker:git image: docker:git
pull: always pull: always
commands: commands:
- git config --global --add safe.directory /drone/src
- git fetch --tags --force - git fetch --tags --force
when: when:
event: event:
@ -473,7 +470,7 @@ steps:
- pull_request - pull_request
- name: deps-backend - name: deps-backend
image: golang:1.20 image: gitea/test_env:linux-1.20-amd64
pull: always pull: always
commands: commands:
- make deps-backend - make deps-backend
@ -553,7 +550,6 @@ steps:
image: docker:git image: docker:git
pull: always pull: always
commands: commands:
- git config --global --add safe.directory /drone/src
- git fetch --tags --force - git fetch --tags --force
when: when:
event: event:
@ -561,7 +557,7 @@ steps:
- pull_request - pull_request
- name: deps-backend - name: deps-backend
image: golang:1.20 image: gitea/test_env:linux-1.20-amd64
pull: always pull: always
commands: commands:
- make deps-backend - make deps-backend
@ -631,7 +627,6 @@ steps:
image: docker:git image: docker:git
pull: always pull: always
commands: commands:
- git config --global --add safe.directory /drone/src
- git fetch --tags --force - git fetch --tags --force
when: when:
event: event:
@ -639,7 +634,7 @@ steps:
- pull_request - pull_request
- name: deps-backend - name: deps-backend
image: golang:1.20 image: gitea/test_env:linux-1.20-arm64
pull: always pull: always
commands: commands:
- make deps-backend - make deps-backend
@ -721,7 +716,7 @@ steps:
depends_on: [deps-frontend] depends_on: [deps-frontend]
- name: deps-backend - name: deps-backend
image: golang:1.18 image: gitea/test_env:linux-1.20-amd64
pull: always pull: always
commands: commands:
- make deps-backend - make deps-backend
@ -830,7 +825,7 @@ trigger:
steps: steps:
- name: download - name: download
image: golang:1.20 image: gitea/test_env:linux-1.20-amd64
pull: always pull: always
commands: commands:
- timeout -s ABRT 40m make generate-license generate-gitignore - timeout -s ABRT 40m make generate-license generate-gitignore
@ -890,7 +885,6 @@ steps:
image: docker:git image: docker:git
pull: always pull: always
commands: commands:
- git config --global --add safe.directory /drone/src
- git fetch --tags --force - git fetch --tags --force
- name: deps-frontend - name: deps-frontend
@ -900,7 +894,7 @@ steps:
- make deps-frontend - make deps-frontend
- name: deps-backend - name: deps-backend
image: golang:1.20 image: gitea/test_env:linux-1.20-amd64
pull: always pull: always
commands: commands:
- make deps-backend - make deps-backend
@ -1026,7 +1020,6 @@ steps:
image: docker:git image: docker:git
pull: always pull: always
commands: commands:
- git config --global --add safe.directory /drone/src
- git fetch --tags --force - git fetch --tags --force
- name: deps-frontend - name: deps-frontend
@ -1036,7 +1029,7 @@ steps:
- make deps-frontend - make deps-frontend
- name: deps-backend - name: deps-backend
image: golang:1.20 image: gitea/test_env:linux-1.20-amd64
pull: always pull: always
commands: commands:
- make deps-backend - make deps-backend
@ -1136,7 +1129,7 @@ trigger:
steps: steps:
- name: build-docs - name: build-docs
image: golang:1.20 image: gitea/test_env:linux-1.20-amd64
commands: commands:
- cd docs - cd docs
- make trans-copy clean build - make trans-copy clean build
@ -1190,7 +1183,6 @@ steps:
image: docker:git image: docker:git
pull: always pull: always
commands: commands:
- git config --global --add safe.directory /drone/src
- git fetch --tags --force - git fetch --tags --force
- name: publish - name: publish
@ -1268,7 +1260,6 @@ steps:
image: docker:git image: docker:git
pull: always pull: always
commands: commands:
- git config --global --add safe.directory /drone/src
- git fetch --tags --force - git fetch --tags --force
- name: publish - name: publish
@ -1341,7 +1332,6 @@ steps:
image: docker:git image: docker:git
pull: always pull: always
commands: commands:
- git config --global --add safe.directory /drone/src
- git fetch --tags --force - git fetch --tags --force
- name: publish - name: publish
@ -1415,7 +1405,6 @@ steps:
image: docker:git image: docker:git
pull: always pull: always
commands: commands:
- git config --global --add safe.directory /drone/src
- git fetch --tags --force - git fetch --tags --force
- name: publish - name: publish
@ -1533,7 +1522,6 @@ steps:
image: docker:git image: docker:git
pull: always pull: always
commands: commands:
- git config --global --add safe.directory /drone/src
- git fetch --tags --force - git fetch --tags --force
- name: publish - name: publish
@ -1611,7 +1599,6 @@ steps:
image: docker:git image: docker:git
pull: always pull: always
commands: commands:
- git config --global --add safe.directory /drone/src
- git fetch --tags --force - git fetch --tags --force
- name: publish - name: publish
@ -1687,7 +1674,6 @@ steps:
image: docker:git image: docker:git
pull: always pull: always
commands: commands:
- git config --global --add safe.directory /drone/src
- git fetch --tags --force - git fetch --tags --force
- name: publish - name: publish
@ -1761,7 +1747,6 @@ steps:
image: docker:git image: docker:git
pull: always pull: always
commands: commands:
- git config --global --add safe.directory /drone/src
- git fetch --tags --force - git fetch --tags --force
- name: publish - name: publish