Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/release/v1.16' into release/dc…
Browse files Browse the repository at this point in the history
…s/v1.16
  • Loading branch information
richmahn committed Apr 7, 2022
2 parents cfd4ae0 + 57c2ca7 commit 82ced50
Show file tree
Hide file tree
Showing 31 changed files with 753 additions and 439 deletions.
106 changes: 53 additions & 53 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ steps:
commands:
- make lint-backend
environment:
GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not
GOPROXY: https://goproxy.io # proxy.golang.org is blocked in China, this proxy is not
GOSUMDB: sum.golang.org
TAGS: bindata sqlite sqlite_unlock_notify sqlite_json
depends_on: [deps-backend]
Expand All @@ -58,7 +58,7 @@ steps:
commands:
- make golangci-lint-windows vet
environment:
GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not
GOPROXY: https://goproxy.io # proxy.golang.org is blocked in China, this proxy is not
GOSUMDB: sum.golang.org
TAGS: bindata sqlite sqlite_unlock_notify sqlite_json
GOOS: windows
Expand All @@ -73,7 +73,7 @@ steps:
commands:
- make lint-backend
environment:
GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not
GOPROXY: https://goproxy.io # proxy.golang.org is blocked in China, this proxy is not
GOSUMDB: sum.golang.org
TAGS: bindata gogit sqlite sqlite_unlock_notify sqlite_json
depends_on: [deps-backend]
Expand Down Expand Up @@ -109,11 +109,11 @@ steps:
depends_on: [test-frontend]

- name: build-backend-no-gcc
image: golang:1.17 # this step is kept as the lowest version of golang that we support
image: golang:1.16 # this step is kept as the lowest version of golang that we support
pull: always
environment:
GO111MODULE: on
GOPROXY: https://goproxy.cn
GOPROXY: https://goproxy.io
commands:
- go build -o gitea_no_gcc # test if build succeeds without the sqlite tag
depends_on: [deps-backend, checks-backend]
Expand All @@ -125,7 +125,7 @@ steps:
image: golang:1.18
environment:
GO111MODULE: on
GOPROXY: https://goproxy.cn
GOPROXY: https://goproxy.io
GOOS: linux
GOARCH: arm64
TAGS: bindata gogit
Expand All @@ -141,7 +141,7 @@ steps:
image: golang:1.18
environment:
GO111MODULE: on
GOPROXY: https://goproxy.cn
GOPROXY: https://goproxy.io
GOOS: windows
GOARCH: amd64
TAGS: bindata gogit
Expand All @@ -156,7 +156,7 @@ steps:
image: golang:1.18
environment:
GO111MODULE: on
GOPROXY: https://goproxy.cn
GOPROXY: https://goproxy.io
GOOS: linux
GOARCH: 386
commands:
Expand Down Expand Up @@ -269,7 +269,7 @@ steps:
- ./build/test-env-check.sh
- make backend
environment:
GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not
GOPROXY: https://goproxy.io # proxy.golang.org is blocked in China, this proxy is not
GOSUMDB: sum.golang.org
TAGS: bindata sqlite sqlite_unlock_notify sqlite_json
depends_on: [deps-backend, prepare-test-env]
Expand All @@ -283,7 +283,7 @@ steps:
commands:
- make unit-test-coverage test-check
environment:
GOPROXY: https://goproxy.cn
GOPROXY: https://goproxy.io
TAGS: bindata sqlite sqlite_unlock_notify sqlite_json
RACE_ENABLED: true
GITHUB_READ_TOKEN:
Expand All @@ -299,7 +299,7 @@ steps:
commands:
- make unit-test-coverage test-check
environment:
GOPROXY: https://goproxy.cn
GOPROXY: https://goproxy.io
TAGS: bindata gogit sqlite sqlite_unlock_notify sqlite_json
RACE_ENABLED: true
GITHUB_READ_TOKEN:
Expand All @@ -315,7 +315,7 @@ steps:
commands:
- make test-mysql-migration integration-test-coverage
environment:
GOPROXY: https://goproxy.cn
GOPROXY: https://goproxy.io
TAGS: bindata
RACE_ENABLED: true
TEST_LDAP: 1
Expand All @@ -332,7 +332,7 @@ steps:
commands:
- timeout -s ABRT 40m make test-mysql8-migration test-mysql8
environment:
GOPROXY: https://goproxy.cn
GOPROXY: https://goproxy.io
TAGS: bindata
RACE_ENABLED: true
TEST_LDAP: 1
Expand All @@ -348,7 +348,7 @@ steps:
commands:
- make test-mssql-migration test-mssql
environment:
GOPROXY: https://goproxy.cn
GOPROXY: https://goproxy.io
TAGS: bindata
RACE_ENABLED: true
TEST_LDAP: 1
Expand All @@ -363,7 +363,7 @@ steps:
commands:
- make coverage
environment:
GOPROXY: https://goproxy.cn
GOPROXY: https://goproxy.io
TAGS: bindata
depends_on: [unit-test, test-mysql]
when:
Expand Down Expand Up @@ -455,7 +455,7 @@ steps:
- ./build/test-env-check.sh
- make backend
environment:
GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not
GOPROXY: https://goproxy.io # proxy.golang.org is blocked in China, this proxy is not
GOSUMDB: sum.golang.org
TAGS: bindata gogit sqlite sqlite_unlock_notify sqlite_json
depends_on: [deps-backend, prepare-test-env]
Expand All @@ -469,10 +469,10 @@ steps:
# commands:
# - timeout -s ABRT 40m make test-sqlite-migration test-sqlite
# environment:
# GOPROXY: https://goproxy.cn
# TAGS: bindata gogit sqlite sqlite_unlock_notify sqlite_json
# GOPROXY: https://goproxy.io
# TAGS: bindata gogit sqlite sqlite_unlock_notify
# RACE_ENABLED: true
# TEST_TAGS: gogit sqlite sqlite_unlock_notify sqlite_json
# TEST_TAGS: gogit sqlite sqlite_unlock_notify
# USE_REPO_TEST_DIR: 1
# depends_on: [build]
# volumes:
Expand All @@ -485,7 +485,7 @@ steps:
# commands:
# - timeout -s ABRT 40m make test-pgsql-migration test-pgsql
# environment:
# GOPROXY: https://goproxy.cn
# GOPROXY: https://goproxy.io
# TAGS: bindata gogit
# RACE_ENABLED: true
# TEST_TAGS: gogit
Expand Down Expand Up @@ -611,7 +611,7 @@ steps:
# trigger:
# branch:
# - main
# - "release/dcs/*"
# - "release/*"
# event:
# - push

Expand Down Expand Up @@ -653,8 +653,8 @@ steps:
# - export PATH=$PATH:$GOPATH/bin
# - make release
# environment:
# GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not
# TAGS: bindata sqlite sqlite_unlock_notify sqlite_json
# GOPROXY: https://goproxy.io # proxy.golang.org is blocked in China, this proxy is not
# TAGS: bindata sqlite sqlite_unlock_notify
# volumes:
# - name: deps
# path: /go
Expand All @@ -679,29 +679,29 @@ steps:
# pull: always
# settings:
# acl: public-read
# bucket: dcs-artifacts
# endpoint: https://cdn.door43.org.s3.us-west-2.amazonaws.com
# bucket: gitea-artifacts
# endpoint: https://ams3.digitaloceanspaces.com
# path_style: true
# source: "dist/release/*"
# strip_prefix: dist/release/
# target: "/gitea/${DRONE_BRANCH##release/dcs/v}"
# target: "/gitea/${DRONE_BRANCH##release/v}"
# environment:
# AWS_ACCESS_KEY_ID:
# from_secret: aws_access_key_id
# AWS_SECRET_ACCESS_KEY:
# from_secret: aws_secret_access_key
# when:
# branch:
# - "release/dcs/*"
# - "release/*"
# event:
# - push

# - name: release-main
# image: woodpeckerci/plugin-s3:latest
# settings:
# acl: public-read
# bucket: dcs-artifacts
# endpoint: https://cdn.door43.org.s3.us-west-2.amazonaws.com
# bucket: gitea-artifacts
# endpoint: https://ams3.digitaloceanspaces.com
# path_style: true
# source: "dist/release/*"
# strip_prefix: dist/release/
Expand Down Expand Up @@ -771,8 +771,8 @@ steps:
# - export PATH=$PATH:$GOPATH/bin
# - make release
# environment:
# GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not
# TAGS: bindata sqlite sqlite_unlock_notify sqlite_json
# GOPROXY: https://goproxy.io # proxy.golang.org is blocked in China, this proxy is not
# TAGS: bindata sqlite sqlite_unlock_notify
# depends_on: [fetch-tags]
# volumes:
# - name: deps
Expand All @@ -799,8 +799,8 @@ steps:
# pull: always
# settings:
# acl: public-read
# bucket: dcs-artifacts
# endpoint: https://cdn.door43.org.s3.us-west-2.amazonaws.com
# bucket: gitea-artifacts
# endpoint: https://ams3.digitaloceanspaces.com
# path_style: true
# source: "dist/release/*"
# strip_prefix: dist/release/
Expand Down Expand Up @@ -856,7 +856,7 @@ steps:
# pull: always
# settings:
# path: docs/public/
# site_id: 80d6116f-7730-4ab8-8c02-b9528293aa07
# site_id: d2260bae-7861-4c02-8646-8f6440b12672
# environment:
# NETLIFY_TOKEN:
# from_secret: netlify_token
Expand Down Expand Up @@ -913,7 +913,7 @@ steps:
# auto_tag_suffix: linux-amd64
repo: unfoldingword/dcs
build_args:
- GOPROXY=https://goproxy.cn
- GOPROXY=https://goproxy.io
password:
from_secret: docker_password
username:
Expand All @@ -931,7 +931,7 @@ steps:
# auto_tag_suffix: linux-amd64-rootless
# repo: unfoldingword/dcs
# build_args:
# - GOPROXY=https://goproxy.cn
# - GOPROXY=https://goproxy.io
# password:
# from_secret: docker_password
# username:
Expand Down Expand Up @@ -976,7 +976,7 @@ steps:
tags: dev-linux-amd64
repo: unfoldingword/dcs
build_args:
- GOPROXY=https://goproxy.cn
- GOPROXY=https://goproxy.io
password:
from_secret: docker_password
username:
Expand All @@ -992,9 +992,9 @@ steps:
# dockerfile: Dockerfile.rootless
# auto_tag: false
# tags: dev-linux-amd64-rootless
# repo: unfoldingword/dcs
# repo: gitea/gitea
# build_args:
# - GOPROXY=https://goproxy.cn
# - GOPROXY=https://goproxy.io
# password:
# from_secret: docker_password
# username:
Expand Down Expand Up @@ -1038,7 +1038,7 @@ steps:
tags: ${DRONE_BRANCH##release/dcs/v}-dev-linux-amd64
repo: unfoldingword/dcs
build_args:
- GOPROXY=https://goproxy.cn
- GOPROXY=https://goproxy.io
password:
from_secret: docker_password
username:
Expand All @@ -1053,10 +1053,10 @@ steps:
# settings:
# dockerfile: Dockerfile.rootless
# auto_tag: false
# tags: ${DRONE_BRANCH##release/dcs/v}-dev-linux-amd64-rootless
# repo: unfoldingword/dcs
# tags: ${DRONE_BRANCH##release/v}-dev-linux-amd64-rootless
# repo: gitea/gitea
# build_args:
# - GOPROXY=https://goproxy.cn
# - GOPROXY=https://goproxy.io
# password:
# from_secret: docker_password
# username:
Expand Down Expand Up @@ -1091,7 +1091,7 @@ steps:
repo: unfoldingword/dcs
tags: linux-arm64
build_args:
- GOPROXY=https://goproxy.cn
- GOPROXY=https://goproxy.io
environment:
PLUGIN_MIRROR:
from_secret: plugin_mirror
Expand Down Expand Up @@ -1146,7 +1146,7 @@ steps:
# auto_tag_suffix: linux-arm64
repo: unfoldingword/dcs
build_args:
- GOPROXY=https://goproxy.cn
- GOPROXY=https://goproxy.io
password:
from_secret: docker_password
username:
Expand All @@ -1164,7 +1164,7 @@ steps:
# auto_tag_suffix: linux-arm64-rootless
# repo: unfoldingword/dcs
# build_args:
# - GOPROXY=https://goproxy.cn
# - GOPROXY=https://goproxy.io
# password:
# from_secret: docker_password
# username:
Expand Down Expand Up @@ -1209,7 +1209,7 @@ steps:
tags: dev-linux-arm64
repo: unfoldingword/dcs
build_args:
- GOPROXY=https://goproxy.cn
- GOPROXY=https://goproxy.io
password:
from_secret: docker_password
username:
Expand All @@ -1225,9 +1225,9 @@ steps:
# dockerfile: Dockerfile.rootless
# auto_tag: false
# tags: dev-linux-arm64-rootless
# repo: unfoldingword/dcs
# repo: gitea/gitea
# build_args:
# - GOPROXY=https://goproxy.cn
# - GOPROXY=https://goproxy.io
# password:
# from_secret: docker_password
# username:
Expand Down Expand Up @@ -1271,7 +1271,7 @@ steps:
tags: ${DRONE_BRANCH##release/dcs/v}-dev-linux-arm64
repo: unfoldingword/dcs
build_args:
- GOPROXY=https://goproxy.cn
- GOPROXY=https://goproxy.io
password:
from_secret: docker_password
username:
Expand All @@ -1286,10 +1286,10 @@ steps:
# settings:
# dockerfile: Dockerfile.rootless
# auto_tag: false
# tags: ${DRONE_BRANCH##release/dcs/v}-dev-linux-arm64-rootless
# repo: unfoldingword/dcs
# tags: ${DRONE_BRANCH##release/v}-dev-linux-arm64-rootless
# repo: gitea/gitea
# build_args:
# - GOPROXY=https://goproxy.cn
# - GOPROXY=https://goproxy.io
# password:
# from_secret: docker_password
# username:
Expand Down
Loading

0 comments on commit 82ced50

Please sign in to comment.