diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/test.yml | 14 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | go.mod | 2 |
4 files changed, 3 insertions, 17 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aeb1c16a..4bce1f86 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ include: - local: .gitlab/ci/test.yml default: - image: golang:1.14 + image: golang:1.16 tags: - gitlab-org diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml index 654262dd..20651186 100644 --- a/.gitlab/ci/test.yml +++ b/.gitlab/ci/test.yml @@ -26,18 +26,6 @@ - echo "Running just the acceptance tests daemonized (inplace)...." - TEST_DAEMONIZE=inplace make acceptance -test:1.14: - extends: .tests-unit - image: golang:1.14 - -test-acceptance:1.14: - extends: .tests-acceptance-tmpdir - image: golang:1.14 - -test-acceptance-inplace:1.14: - extends: .tests-acceptance-inplace - image: golang:1.14 - test:1.15: extends: .tests-unit image: golang:1.15 @@ -64,7 +52,6 @@ test-acceptance-inplace:1.16: race: extends: .tests-common - image: golang:1.16 script: - echo "Running race detector" - make setup @@ -72,7 +59,6 @@ race: cover: extends: .tests-common - image: golang:1.16 script: - make generate-mocks - make cover @@ -4,7 +4,7 @@ [](https://gitlab.com/gitlab-org/gitlab-pages/commits/master) This is a simple HTTP server written in Go, made to serve GitLab Pages with -CNAMEs and SNI using HTTP/HTTP2. The minimum supported Go version is v1.14. +CNAMEs and SNI using HTTP/HTTP2. The minimum supported Go version is v1.15. ### How it generates routes @@ -1,6 +1,6 @@ module gitlab.com/gitlab-org/gitlab-pages -go 1.14 +go 1.15 require ( github.com/andybalholm/brotli v1.0.3 |