Skip to content

Commit

Permalink
Merge branch 'master' into go-gitea#14559-reduce-wip-notifications
Browse files Browse the repository at this point in the history
  • Loading branch information
jpraet authored Mar 26, 2021
2 parents 62563c0 + dc56fb7 commit e5dbd95
Show file tree
Hide file tree
Showing 2,039 changed files with 75,474 additions and 76,649 deletions.
96 changes: 27 additions & 69 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ platform:
os: linux
arch: arm64

workspace:
base: /go
path: src/code.gitea.io/gitea

trigger:
event:
- push
Expand All @@ -31,7 +27,7 @@ steps:

- name: lint-backend
pull: always
image: golang:1.15
image: gitea/test_env:linux-arm64 # https://gitea.com/gitea/test-env
commands:
- make lint-backend
environment:
Expand All @@ -41,7 +37,7 @@ steps:

- name: lint-backend-windows
pull: always
image: golang:1.15
image: gitea/test_env:linux-arm64 # https://gitea.com/gitea/test-env
commands:
- make golangci-lint vet
environment:
Expand All @@ -53,7 +49,7 @@ steps:

- name: lint-backend-gogit
pull: always
image: golang:1.15
image: gitea/test_env:linux-arm64 # https://gitea.com/gitea/test-env
commands:
- make lint-backend
environment:
Expand All @@ -69,7 +65,7 @@ steps:

- name: checks-backend
pull: always
image: golang:1.15
image: golang:1.16
commands:
- make checks-backend
depends_on: [lint-backend]
Expand All @@ -91,7 +87,7 @@ steps:
depends_on: [checks-backend]

- name: build-backend-arm64
image: golang:1.15
image: golang:1.16
environment:
GO111MODULE: on
GOPROXY: off
Expand All @@ -104,7 +100,7 @@ steps:
depends_on: [checks-backend]

- name: build-backend-windows
image: golang:1.15
image: golang:1.16
environment:
GO111MODULE: on
GOPROXY: off
Expand All @@ -116,7 +112,7 @@ steps:
depends_on: [checks-backend]

- name: build-backend-386
image: golang:1.15
image: golang:1.16
environment:
GO111MODULE: on
GOPROXY: off
Expand All @@ -143,10 +139,6 @@ trigger:
- tag
- pull_request

workspace:
base: /go
path: src/code.gitea.io/gitea

services:
- name: mysql
image: mysql:5.7
Expand Down Expand Up @@ -176,7 +168,7 @@ services:
image: elasticsearch:7.5.0

- name: minio
image: minio/minio:RELEASE.2021-01-16T02-19-44Z
image: minio/minio:RELEASE.2021-03-12T00-00-47Z
commands:
- minio server /data
environment:
Expand All @@ -195,7 +187,7 @@ steps:

- name: build
pull: always
image: golang:1.15
image: golang:1.16
commands:
- make backend
environment:
Expand All @@ -210,7 +202,7 @@ steps:
- git update-ref refs/heads/tag_test ${DRONE_COMMIT_SHA}

- name: unit-test
image: golang:1.15
image: golang:1.16
commands:
- make unit-test-coverage test-check
environment:
Expand All @@ -221,7 +213,7 @@ steps:

- name: unit-test-gogit
pull: always
image: golang:1.15
image: golang:1.16
commands:
- make unit-test-coverage test-check
environment:
Expand All @@ -231,10 +223,8 @@ steps:
from_secret: github_read_token

- name: test-mysql
image: golang:1.15
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
commands:
- "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
- apt-get install -y git-lfs
- make test-mysql-migration integration-test-coverage
environment:
GOPROXY: off
Expand All @@ -246,10 +236,8 @@ steps:
- build

- name: test-mysql8
image: golang:1.15
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
commands:
- "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
- apt-get install -y git-lfs
- timeout -s ABRT 40m make test-mysql8-migration test-mysql8
environment:
GOPROXY: off
Expand All @@ -260,10 +248,8 @@ steps:
- build

- name: test-mssql
image: golang:1.15
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
commands:
- "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
- apt-get install -y git-lfs
- make test-mssql-migration test-mssql
environment:
GOPROXY: off
Expand All @@ -274,7 +260,7 @@ steps:
- build

- name: generate-coverage
image: golang:1.15
image: golang:1.16
commands:
- make coverage
environment:
Expand Down Expand Up @@ -324,10 +310,6 @@ trigger:
- tag
- pull_request

workspace:
base: /go
path: src/code.gitea.io/gitea

services:
- name: pgsql
pull: default
Expand All @@ -352,19 +334,17 @@ steps:

- name: build
pull: always
image: golang:1.15
image: golang:1.16
commands:
- make backend
environment:
GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not
GOSUMDB: sum.golang.org
TAGS: bindata sqlite sqlite_unlock_notify
TAGS: bindata gogit sqlite sqlite_unlock_notify

- name: test-sqlite
image: golang:1.15
image: gitea/test_env:linux-arm64 # https://gitea.com/gitea/test-env
commands:
- "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
- apt-get install -y git-lfs
- timeout -s ABRT 40m make test-sqlite-migration test-sqlite
environment:
GOPROXY: off
Expand All @@ -375,10 +355,8 @@ steps:
- build

- name: test-pgsql
image: golang:1.15
image: gitea/test_env:linux-arm64 # https://gitea.com/gitea/test-env
commands:
- "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
- apt-get install -y git-lfs
- timeout -s ABRT 40m make test-pgsql-migration test-pgsql
environment:
GOPROXY: off
Expand All @@ -397,10 +375,6 @@ platform:
os: linux
arch: arm64

workspace:
base: /go
path: src/code.gitea.io/gitea

trigger:
branch:
- master
Expand Down Expand Up @@ -459,11 +433,7 @@ name: update_gitignore_and_licenses

platform:
os: linux
arch: amd64

workspace:
base: /go
path: src/code.gitea.io/gitea
arch: arm64

trigger:
branch:
Expand All @@ -475,7 +445,7 @@ trigger:

steps:
- name: download
image: golang:1.15
image: golang:1.16
commands:
- timeout -s ABRT 40m make generate-license generate-gitignore

Expand All @@ -501,8 +471,8 @@ platform:
arch: amd64

workspace:
base: /go
path: src/code.gitea.io/gitea
base: /source
path: /

trigger:
branch:
Expand All @@ -523,7 +493,7 @@ steps:

- name: static
pull: always
image: techknowlogick/xgo:go-1.15.x
image: techknowlogick/xgo:go-1.16.x
commands:
- curl -sL https://deb.nodesource.com/setup_14.x | bash - && apt -y install nodejs
- export PATH=$PATH:$GOPATH/bin
Expand Down Expand Up @@ -599,8 +569,8 @@ platform:
arch: amd64

workspace:
base: /go
path: src/code.gitea.io/gitea
base: /source
path: /

trigger:
event:
Expand All @@ -619,7 +589,7 @@ steps:

- name: static
pull: always
image: techknowlogick/xgo:go-1.15.x
image: techknowlogick/xgo:go-1.16.x
commands:
- curl -sL https://deb.nodesource.com/setup_14.x | bash - && apt -y install nodejs
- export PATH=$PATH:$GOPATH/bin
Expand Down Expand Up @@ -719,10 +689,6 @@ platform:
os: linux
arch: amd64

workspace:
base: /go
path: src/code.gitea.io/gitea

depends_on:
- testing-amd64
- testing-arm64
Expand Down Expand Up @@ -788,10 +754,6 @@ platform:
os: linux
arch: arm64

workspace:
base: /go
path: src/code.gitea.io/gitea

depends_on:
- compliance

Expand Down Expand Up @@ -824,10 +786,6 @@ platform:
os: linux
arch: arm64

workspace:
base: /go
path: src/code.gitea.io/gitea

depends_on:
- testing-amd64
- testing-arm64
Expand Down
11 changes: 11 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ rules:
unicode-bom: [2, never]
unicorn/better-regex: [0]
unicorn/catch-error-name: [0]
unicorn/consistent-destructuring: [2]
unicorn/consistent-function-scoping: [2]
unicorn/custom-error-definition: [0]
unicorn/empty-brace-spaces: [2]
Expand All @@ -356,19 +357,24 @@ rules:
unicorn/import-style: [0]
unicorn/new-for-builtins: [2]
unicorn/no-abusive-eslint-disable: [0]
unicorn/no-array-for-each: [0]
unicorn/no-array-instanceof: [0]
unicorn/no-array-push-push: [2]
unicorn/no-console-spaces: [0]
unicorn/no-fn-reference-in-iterator: [0]
unicorn/no-for-loop: [0]
unicorn/no-hex-escape: [0]
unicorn/no-keyword-prefix: [0]
unicorn/no-lonely-if: [2]
unicorn/no-nested-ternary: [0]
unicorn/no-new-array: [0]
unicorn/no-new-buffer: [0]
unicorn/no-null: [0]
unicorn/no-object-as-default-parameter: [2]
unicorn/no-process-exit: [0]
unicorn/no-reduce: [2]
unicorn/no-static-only-class: [2]
unicorn/no-this-assignment: [2]
unicorn/no-unreadable-array-destructuring: [0]
unicorn/no-unsafe-regex: [0]
unicorn/no-unused-properties: [2]
Expand All @@ -378,8 +384,12 @@ rules:
unicorn/numeric-separators-style: [0]
unicorn/prefer-add-event-listener: [2]
unicorn/prefer-array-find: [2]
unicorn/prefer-array-flat: [2]
unicorn/prefer-array-index-of: [2]
unicorn/prefer-array-some: [2]
unicorn/prefer-dataset: [2]
unicorn/prefer-date-now: [2]
unicorn/prefer-default-parameters: [0]
unicorn/prefer-event-key: [2]
unicorn/prefer-includes: [2]
unicorn/prefer-math-trunc: [2]
Expand All @@ -391,6 +401,7 @@ rules:
unicorn/prefer-optional-catch-binding: [2]
unicorn/prefer-query-selector: [0]
unicorn/prefer-reflect-apply: [0]
unicorn/prefer-regexp-test: [2]
unicorn/prefer-replace-all: [0]
unicorn/prefer-set-has: [0]
unicorn/prefer-spread: [0]
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ linters-settings:
gocritic:
disabled-checks:
- ifElseChain
- singleCaseSwitch # Every time this occured in the code, there was no other way.
- singleCaseSwitch # Every time this occurred in the code, there was no other way.

issues:
exclude-rules:
Expand Down
Loading

0 comments on commit e5dbd95

Please sign in to comment.