Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessio Caiazza <acaiazza@gitlab.com>2020-05-15 14:17:17 +0300
committerAlessio Caiazza <acaiazza@gitlab.com>2020-05-15 14:17:17 +0300
commit151ecc2704b7467488fab0a9b2c2410f75d438ff (patch)
treeafa27b70296120d321113b31ecea0296a63b8278
parentb6cdfe830c9d0250f036acf69c9585bf4ec7b947 (diff)
parent055979c57343507d0bc14e8b64fd8fb0c44c5e32 (diff)
Merge branch 'min-go-1.13' into 'master'
bump minimum go version to 1.12 See merge request gitlab-org/gitlab-pages!279
-rw-r--r--.gitlab-ci.yml6
-rw-r--r--README.md2
2 files changed, 2 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b166537..33f20858 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ workflow:
- if: '$CI_COMMIT_BRANCH =~ /^security\//'
default:
- image: golang:1.11
+ image: golang:1.12
tags:
- gitlab-org
@@ -81,10 +81,6 @@ verify:
paths:
- coverage.html
-test:1.11:
- extends: .tests
- image: golang:1.11
-
test:1.12:
extends: .tests
image: golang:1.12
diff --git a/README.md b/README.md
index 91cd697d..0c3b0f5c 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
[![coverage report](https://gitlab.com/gitlab-org/gitlab-pages/badges/master/coverage.svg)](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.11.
+CNAMEs and SNI using HTTP/HTTP2. The minimum supported Go version is v1.12.
This is made to work in small to medium-scale environments. Start-up time scales
with the number of projects being served, so the daemon is currently unsuitable