diff options
author | Jaime Martinez <jmartinez@gitlab.com> | 2023-02-09 02:06:51 +0300 |
---|---|---|
committer | Jaime Martinez <jmartinez@gitlab.com> | 2023-02-09 02:06:51 +0300 |
commit | a0766fc3152993b320824d73055b903f624387f5 (patch) | |
tree | 3fe8cb50c4d84545134b4e377c82be075c86af48 | |
parent | 298f8eccf2fcb88280be3ea6ecee81842c1f77d4 (diff) | |
parent | 89eade2153a0c43a3ae0dd131fe0b9a57955e763 (diff) |
Merge branch 'kassio/update-golang' into 'master'
Update go to 1.18
See merge request https://gitlab.com/gitlab-org/gitlab-pages/-/merge_requests/851
Merged-by: Jaime Martinez <jmartinez@gitlab.com>
Co-authored-by: Kassio Borges <kassioborgesm@gmail.com>
Changelog: changed
-rw-r--r-- | .gitlab/ci/test.yml | 2 | ||||
-rw-r--r-- | go.mod | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml index 103f925e..ff373dbf 100644 --- a/.gitlab/ci/test.yml +++ b/.gitlab/ci/test.yml @@ -11,7 +11,7 @@ image: golang:${GO_VERSION} parallel: matrix: - - GO_VERSION: ["1.17", "1.18", "1.19"] + - GO_VERSION: ["1.18", "1.19", "1.20"] tests: extends: .tests-matrix @@ -2,9 +2,10 @@ module gitlab.com/gitlab-org/gitlab-pages // before bumping this: // - update the minimum version used in ci -// - make sure the internal/vfs/serving package is synced -// with upstream -go 1.17 +// - make sure the internal/vfs/serving package is synced with upstream +// - which can be done in the go repository with: +// git log --oneline -s -L:serveContent:src/net/http/fs.go --since="2021-02-16" +go 1.18 require ( github.com/golang-jwt/jwt/v4 v4.1.0 |