From 5f618248a98ffbb7066100ffe1955faf791d0205 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 10 Jun 2022 11:34:41 +0800 Subject: [PATCH] Use Golang 1.18 for Gitea 1.17 release (#19918) Use Golang 1.18 (as minimal requirement) for Gitea 1.17 release, make sure the Golang version is still actively supported during Gitea 1.17 lifecycle. Co-authored-by: zeripath Co-authored-by: Lunny Xiao Co-authored-by: 6543 <6543@obermui.de> --- .drone.yml | 2 +- README.md | 2 +- docs/config.yaml | 2 +- docs/content/doc/advanced/config-cheat-sheet.en-us.md | 4 ++-- go.mod | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1aac10a82..928e75d1a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -109,7 +109,7 @@ 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.18 # this step is kept as the lowest version of golang that we support pull: always environment: GO111MODULE: on diff --git a/README.md b/README.md index 84c0524ed..172e16cf5 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ or if SQLite support is required: The `build` target is split into two sub-targets: -- `make backend` which requires [Go 1.17](https://go.dev/dl/) or greater. +- `make backend` which requires [Go Stable](https://go.dev/dl/), required version is defined in [go.mod](/go.mod). - `make frontend` which requires [Node.js LTS](https://nodejs.org/en/download/) or greater and Internet connectivity to download npm dependencies. When building from the official source tarballs which include pre-built frontend files, the `frontend` target will not be triggered, making it possible to build without Node.js and Internet connectivity. diff --git a/docs/config.yaml b/docs/config.yaml index 075fd32ef..5a773662c 100644 --- a/docs/config.yaml +++ b/docs/config.yaml @@ -19,7 +19,7 @@ params: author: The Gitea Authors website: https://docs.gitea.io version: 1.16.8 - minGoVersion: 1.17 + minGoVersion: 1.18 goVersion: 1.18 minNodeVersion: 14 diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index edd23012f..3981dc5fa 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -315,8 +315,8 @@ The following configuration set `Content-Type: application/vnd.android.package-a - `SSL_MAX_VERSION`: **\**: Set the maximum version of ssl support. - `SSL_CURVE_PREFERENCES`: **X25519,P256**: Set the preferred curves, - `SSL_CIPHER_SUITES`: **ecdhe_ecdsa_with_aes_256_gcm_sha384,ecdhe_rsa_with_aes_256_gcm_sha384,ecdhe_ecdsa_with_aes_128_gcm_sha256,ecdhe_rsa_with_aes_128_gcm_sha256,ecdhe_ecdsa_with_chacha20_poly1305,ecdhe_rsa_with_chacha20_poly1305**: Set the preferred cipher suites. - - If there is not hardware support for AES suites by default the cha cha suites will be preferred over the AES suites - - supported suites as of go 1.17 are: + - If there is no hardware support for AES suites, by default the ChaCha suites will be preferred over the AES suites. + - supported suites as of Go 1.18 are: - TLS 1.0 - 1.2 cipher suites - "rsa_with_rc4_128_sha" - "rsa_with_3des_ede_cbc_sha" diff --git a/go.mod b/go.mod index 4dea7f942..e7cb85ad1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module code.gitea.io/gitea -go 1.17 +go 1.18 require ( code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b