diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-10-26 12:49:21 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-10-26 15:05:05 +0300 |
| commit | 5de8773549136c7045ef3267d9bca4b1a6f8bb5a (patch) | |
| tree | f35b8c81d34ca5e0a9bdde432fab1f1cb111007e /.gitlab-ci.yml | |
| parent | a43747355c74369611b5be729ac9941e7af68b49 (diff) | |
ci: Use variable for the default Go version
Instead of manually specifying the Go version to 1.14 in several build
images, this instead creates a default GO_VERSION variable which is set
to 1.14.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e535d25d..d32aa06e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,7 @@ variables: SAST_DISABLE_DIND: "true" SAST_DEFAULT_ANALYZERS: "gosec" GIT_VERSION: "v2.29.0" + GO_VERSION: "1.14" RUBY_VERSION: "2.7" danger-review: @@ -65,7 +66,7 @@ danger-review: expire_in: 1 week .postgres_template: &postgres_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-1.14-git-2.28-pgbouncer-1.14 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.28-pgbouncer-1.14 services: - postgres:11.8 variables: @@ -261,7 +262,7 @@ praefect_sql_test: - make test-postgres lint: - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-1.14-git-2.28 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.28 stage: test retry: 2 script: @@ -269,7 +270,7 @@ lint: - make lint objectinfo_fuzz_test: - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-1.14-git-2.28 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.28 extends: .fuzz_base stage: test script: |