diff options
author | Paul Okstad <pokstad@gitlab.com> | 2020-12-03 21:25:18 +0300 |
---|---|---|
committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-12-03 21:25:18 +0300 |
commit | 32f0291e6214fcb694b047187fd14c032c5ace7d (patch) | |
tree | 63530c487c6e9d88befd34f15b3afe644a4811c0 /.gitlab-ci.yml | |
parent | add5f3dd182c99b4d9e1cf93e45fec1214c00659 (diff) |
Support Golang v1.14 and v1.15 in CI
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5c137f4aa..7bd955c2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: - publish default: - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-golang-1.14-git-2.29 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-golang-1.15-git-2.29 tags: - gitlab-org @@ -14,7 +14,7 @@ variables: SAST_DISABLE_DIND: "true" SAST_DEFAULT_ANALYZERS: "gosec" GIT_VERSION: "v2.29.0" - GO_VERSION: "1.14" + GO_VERSION: "1.15" RUBY_VERSION: "2.7" include: @@ -120,7 +120,7 @@ build: - _support/test-boot . parallel: matrix: - - GO_VERSION: [ "1.13", "1.14" ] + - GO_VERSION: [ "1.14", "1.15" ] GIT_VERSION: [ "v2.29.0" ] binaries: @@ -141,7 +141,7 @@ binaries: expire_in: 6 months parallel: matrix: - - GO_VERSION: [ "1.13", "1.14" ] + - GO_VERSION: [ "1.14", "1.15" ] GIT_VERSION: "v2.29.0" test: @@ -162,10 +162,10 @@ test: junit: _build/reports/go-tests-report-go-${GO_VERSION}-git-${GIT_VERSION}.xml parallel: matrix: - - GO_VERSION: [ "1.13", "1.14" ] + - GO_VERSION: [ "1.14", "1.15" ] GIT_VERSION: [ "v2.29.0" ] TARGET: test - - GO_VERSION: "1.14" + - GO_VERSION: "1.15" GIT_VERSION: "v2.29.0" TARGET: [ test-with-proxies, test-with-praefect, race-go ] @@ -177,7 +177,7 @@ nightly:git: - make all ${TARGET} parallel: matrix: - - GO_VERSION: "1.14" + - GO_VERSION: "1.15" GIT_VERSION: ["master", "next"] TARGET: [ test, test-with-proxies, test-with-praefect ] rules: |