diff options
| author | Jaime Martinez <jmartinez@gitlab.com> | 2021-08-19 07:57:10 +0300 |
|---|---|---|
| committer | Jaime Martinez <jmartinez@gitlab.com> | 2021-08-19 07:57:10 +0300 |
| commit | 25fe5fe978da88ff92e50d3f4f4aff44334d3774 (patch) | |
| tree | e27c0bac9732b714c2e241c1577ddc1e1f661195 | |
| parent | d79892fe182e3c28cd055bd34669d82c1ab5294b (diff) | |
| parent | 97b9e938a3d87935d52aad6fc3864144426c5d15 (diff) | |
Merge branch 'ci/go-1.17' into 'master'
ci: start integrating go 1.17 into the CI pipelines
See merge request gitlab-org/gitlab-pages!548
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/test.yml | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4bce1f86..fe3e0960 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ include: - local: .gitlab/ci/test.yml default: - image: golang:1.16 + image: golang:1.17 tags: - gitlab-org diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml index 26107b85..93870a8a 100644 --- a/.gitlab/ci/test.yml +++ b/.gitlab/ci/test.yml @@ -50,6 +50,18 @@ test-acceptance-inplace:1.16: extends: .tests-acceptance-inplace image: golang:1.16 +test:1.17: + extends: .tests-unit + image: golang:1.17 + +test-acceptance:1.17: + extends: .tests-acceptance-tmpdir + image: golang:1.17 + +test-acceptance-inplace:1.17: + extends: .tests-acceptance-inplace + image: golang:1.17 + race: extends: .tests-common script: |