Skip to content

go1.16 #14783

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

Merged
merged 16 commits into from
Feb 28, 2021
Merged

go1.16 #14783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
53766ff
go1.16
techknowlogick Feb 24, 2021
e514eff
docs
techknowlogick Feb 24, 2021
b04d908
Merge branch 'master' into go-1.16
6543 Feb 24, 2021
23f73ec
make vendor
techknowlogick Feb 24, 2021
f9632af
Merge branch 'go-1.16' of github.com:techknowlogick/gitea into go-1.16
techknowlogick Feb 24, 2021
ba124d8
Merge branch 'master' into go-1.16
techknowlogick Feb 26, 2021
d21e1c8
Merge branch 'master' into go-1.16
6543 Feb 27, 2021
fc2693e
Merge branch 'master' into go-1.16
lafriks Feb 27, 2021
7835534
Merge branch 'master' into go-1.16
lunny Feb 28, 2021
42acb8a
Merge branch 'master' into go-1.16
lafriks Feb 28, 2021
294f1c3
build w/ gogit
techknowlogick Feb 28, 2021
48e1178
build w/o gogit
techknowlogick Feb 28, 2021
681aff1
Remove workspace as 1.16 is not using go path anymore
techknowlogick Feb 28, 2021
7f7c3c9
update vendor
techknowlogick Feb 28, 2021
dbf0707
add gogit back
techknowlogick Feb 28, 2021
5690446
Merge branch 'master' into go-1.16
techknowlogick Feb 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
84 changes: 22 additions & 62 deletions .drone.yml
View file
Open in desktop
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: golang:1.16
commands:
- make lint-backend
environment:
Expand All @@ -41,7 +37,7 @@ steps:

- name: lint-backend-windows
pull: always
image: golang:1.15
image: golang:1.16
commands:
- make golangci-lint vet
environment:
Expand All @@ -53,7 +49,7 @@ steps:

- name: lint-backend-gogit
pull: always
image: golang:1.15
image: golang:1.16
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 @@ -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,7 +223,7 @@ steps:
from_secret: github_read_token

- name: test-mysql
image: golang:1.15
image: golang:1.16
commands:
- "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
- apt-get install -y git-lfs
Expand All @@ -246,7 +238,7 @@ steps:
- build

- name: test-mysql8
image: golang:1.15
image: golang:1.16
commands:
- "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
- apt-get install -y git-lfs
Expand All @@ -260,7 +252,7 @@ steps:
- build

- name: test-mssql
image: golang:1.15
image: golang:1.16
commands:
- "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
- apt-get install -y git-lfs
Expand All @@ -274,7 +266,7 @@ steps:
- build

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

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

services:
- name: pgsql
pull: default
Expand All @@ -352,16 +340,16 @@ 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: golang:1.16
commands:
- "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
- apt-get install -y git-lfs
Expand All @@ -375,7 +363,7 @@ steps:
- build

- name: test-pgsql
image: golang:1.15
image: golang:1.16
commands:
- "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash"
- apt-get install -y git-lfs
Expand All @@ -397,10 +385,6 @@ platform:
os: linux
arch: arm64

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

trigger:
branch:
- master
Expand Down Expand Up @@ -459,11 +443,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 +455,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 @@ -500,10 +480,6 @@ platform:
os: linux
arch: amd64

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

trigger:
branch:
- master
Expand All @@ -523,7 +499,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 @@ -598,10 +574,6 @@ platform:
os: linux
arch: amd64

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

trigger:
event:
- tag
Expand All @@ -619,7 +591,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 +691,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 +756,6 @@ platform:
os: linux
arch: arm64

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

depends_on:
- compliance

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

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

depends_on:
- testing-amd64
- testing-arm64
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

###################################
#Build stage
FROM golang:1.15-alpine3.13 AS build-env
FROM golang:1.16-alpine3.13 AS build-env

ARG GOPROXY
ENV GOPROXY ${GOPROXY:-direct}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.rootless
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

###################################
#Build stage
FROM golang:1.15-alpine3.13 AS build-env
FROM golang:1.16-alpine3.13 AS build-env

ARG GOPROXY
ENV GOPROXY ${GOPROXY:-direct}
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ SHASUM ?= shasum -a 256
HAS_GO = $(shell hash $(GO) > /dev/null 2>&1 && echo "GO" || echo "NOGO" )
COMMA := ,

XGO_VERSION := go-1.15.x
XGO_VERSION := go-1.16.x
MIN_GO_VERSION := 001014000
MIN_NODE_VERSION := 010013000

Expand Down Expand Up @@ -596,7 +596,7 @@ release-darwin: | $(DIST_DIRS)
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
GO111MODULE=off $(GO) get -u src.techknowlogick.com/xgo; \
fi
CGO_CFLAGS="$(CGO_CFLAGS)" GO111MODULE=off xgo -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/amd64' -out gitea-$(VERSION) .
CGO_CFLAGS="$(CGO_CFLAGS)" GO111MODULE=off xgo -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin-10.12/amd64' -out gitea-$(VERSION) .
ifeq ($(CI),drone)
cp /build/* $(DIST)/binaries
endif
Expand Down
2 changes: 1 addition & 1 deletion docs/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ params:
website: https://docs.gitea.io
version: 1.13.2
minGoVersion: 1.14
goVersion: 1.15
goVersion: 1.16
minNodeVersion: 10.13

outputs:
Expand Down
Loading