From 274aeb3a9e13da47a925eabe0e43ed0b1424d02a Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 17 Aug 2021 08:31:28 -0400 Subject: [PATCH] build with go1.17 (#16707) Co-authored-by: Lauris BH --- .drone.yml | 22 +++++++++++----------- Dockerfile | 2 +- Dockerfile.rootless | 2 +- Makefile | 2 +- docs/config.yaml | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.drone.yml b/.drone.yml index a11f152d684..26726873b9f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -65,7 +65,7 @@ steps: - name: checks-backend pull: always - image: golang:1.16 + image: golang:1.17 commands: - make checks-backend depends_on: [lint-backend] @@ -93,7 +93,7 @@ steps: depends_on: [checks-backend] - name: build-backend-arm64 - image: golang:1.16 + image: golang:1.17 environment: GO111MODULE: on GOPROXY: off @@ -106,7 +106,7 @@ steps: depends_on: [checks-backend] - name: build-backend-windows - image: golang:1.16 + image: golang:1.17 environment: GO111MODULE: on GOPROXY: off @@ -118,7 +118,7 @@ steps: depends_on: [checks-backend] - name: build-backend-386 - image: golang:1.16 + image: golang:1.17 environment: GO111MODULE: on GOPROXY: off @@ -193,7 +193,7 @@ steps: - name: build pull: always - image: golang:1.16 + image: golang:1.17 commands: - make backend environment: @@ -208,7 +208,7 @@ steps: - git update-ref refs/heads/tag_test ${DRONE_COMMIT_SHA} - name: unit-test - image: golang:1.16 + image: golang:1.17 commands: - make unit-test-coverage test-check environment: @@ -218,7 +218,7 @@ steps: from_secret: github_read_token - name: unit-test-race - image: golang:1.16 + image: golang:1.17 commands: - make test-backend environment: @@ -230,7 +230,7 @@ steps: - name: unit-test-gogit pull: always - image: golang:1.16 + image: golang:1.17 commands: - make unit-test-coverage test-check environment: @@ -277,7 +277,7 @@ steps: - build - name: generate-coverage - image: golang:1.16 + image: golang:1.17 commands: - make coverage environment: @@ -351,7 +351,7 @@ steps: - name: build pull: always - image: golang:1.16 + image: golang:1.17 commands: - make backend environment: @@ -463,7 +463,7 @@ trigger: steps: - name: download - image: golang:1.16 + image: golang:1.17 commands: - timeout -s ABRT 40m make generate-license generate-gitignore diff --git a/Dockerfile b/Dockerfile index 3445544a94c..382f6f330ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ################################### #Build stage -FROM golang:1.16-alpine3.13 AS build-env +FROM golang:1.17-alpine3.13 AS build-env ARG GOPROXY ENV GOPROXY ${GOPROXY:-direct} diff --git a/Dockerfile.rootless b/Dockerfile.rootless index a0cc20095c1..64dd12bb6bf 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -1,7 +1,7 @@ ################################### #Build stage -FROM golang:1.16-alpine3.13 AS build-env +FROM golang:1.17-alpine3.13 AS build-env ARG GOPROXY ENV GOPROXY ${GOPROXY:-direct} diff --git a/Makefile b/Makefile index de14ce6be63..3cc9ff0cd3f 100644 --- a/Makefile +++ b/Makefile @@ -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.16.x +XGO_VERSION := go-1.17.x MIN_GO_VERSION := 001016000 MIN_NODE_VERSION := 012017000 diff --git a/docs/config.yaml b/docs/config.yaml index a0f39987f0b..c4c507b99bf 100644 --- a/docs/config.yaml +++ b/docs/config.yaml @@ -20,7 +20,7 @@ params: website: https://docs.gitea.io version: 1.14.6 minGoVersion: 1.16 - goVersion: 1.16 + goVersion: 1.17 minNodeVersion: 12.17 outputs: