diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/test.yml | 8 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | test/acceptance/serving_test.go | 11 |
5 files changed, 4 insertions, 21 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 497e3d51..aeb1c16a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ include: - local: .gitlab/ci/test.yml default: - image: golang:1.13 + image: golang:1.14 tags: - gitlab-org diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml index f6ca3e08..f0e484b9 100644 --- a/.gitlab/ci/test.yml +++ b/.gitlab/ci/test.yml @@ -24,14 +24,6 @@ - TEST_DAEMONIZE=inplace make acceptance - make junit-report -test:1.13: - extends: .tests-unit - image: golang:1.13 - -test-acceptance:1.13: - extends: .tests-acceptance-deamon - image: golang:1.13 - test:1.14: extends: .tests-unit image: golang:1.14 @@ -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.13. +CNAMEs and SNI using HTTP/HTTP2. The minimum supported Go version is v1.14. ### How it generates routes @@ -1,6 +1,6 @@ module gitlab.com/gitlab-org/gitlab-pages -go 1.13 +go 1.14 require ( github.com/andybalholm/brotli v1.0.1 diff --git a/test/acceptance/serving_test.go b/test/acceptance/serving_test.go index a4450e53..59c53510 100644 --- a/test/acceptance/serving_test.go +++ b/test/acceptance/serving_test.go @@ -4,7 +4,6 @@ import ( "fmt" "io/ioutil" "net/http" - "net/textproto" "os" "path" "strings" @@ -745,7 +744,7 @@ func TestServerRepliesWithHeaders(t *testing.T) { require.Equal(t, http.StatusOK, rsp.StatusCode) for key, value := range test.expectedHeaders { - got := headerValues(rsp.Header, key) + got := rsp.Header.Values(key) require.Equal(t, value, got) } } @@ -778,14 +777,6 @@ func TestServerRepliesWithHeaders(t *testing.T) { } } -func headerValues(header http.Header, key string) []string { - h := textproto.MIMEHeader(header) - - // NOTE: cannot use header.Values() in Go 1.13 or lower, this is the implementation - // from Go 1.15 https://github.com/golang/go/blob/release-branch.go1.15/src/net/textproto/header.go#L46 - return h[textproto.CanonicalMIMEHeaderKey(key)] -} - func TestDiskDisabledFailsToServeFileAndLocalContent(t *testing.T) { skipUnlessEnabled(t) |