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

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2023-08-14 23:04:41 +0300
committerStan Hu <stanhu@gmail.com>2023-08-16 10:11:53 +0300
commitfb7d606a70f55b086354e4f15ebfb63869f1c4af (patch)
tree3a7b7d9342a86b1ee7114da762700028cbb65c13
parentaaff3df67c6323e54fc7c4349727b9523b1063b5 (diff)
Add Go 1.21.0 to the build matrixsh-include-go-1.21
This tests that Gitaly can work with the latest released version of Go.
-rw-r--r--.gitlab-ci.yml8
-rw-r--r--.tool-versions2
2 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 77dda5aff..94f924a12 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -184,7 +184,7 @@ build:
- go run ./tools/test-boot ${TEST_BOOT_ARGS}
parallel:
matrix:
- - GO_VERSION: [ "1.20" ]
+ - GO_VERSION: [ "1.20", "1.21" ]
TEST_BOOT_ARGS: "--bundled-git"
- GIT_VERSION: "v2.41.0"
@@ -207,7 +207,7 @@ build:binaries:
expire_in: 6 months
parallel:
matrix:
- - GO_VERSION: [ "1.20" ]
+ - GO_VERSION: [ "1.20", "1.21" ]
rules:
- if: $CI_COMMIT_TAG
@@ -217,7 +217,7 @@ test:
matrix:
# The following jobs all test with our default Git version, which is
# using bundled Git binaries.
- - GO_VERSION: [ "1.20" ]
+ - GO_VERSION: [ "1.20", "1.21" ]
TEST_TARGET: test
- TEST_TARGET: [ test-with-praefect, race-go, test-wal, test-with-praefect-wal]
# We also verify that things work as expected with a non-bundled Git
@@ -309,7 +309,7 @@ test:fips:
matrix:
- TEST_TARGET: [ test, test-with-praefect ]
FIPS_MODE: "YesPlease"
- GO_VERSION: ["1.20"]
+ GO_VERSION: [ "1.20", "1.21" ]
rules:
# Automatically run the job when the FIPS label is set.
- if: $CI_MERGE_REQUEST_LABELS =~ /FIPS/
diff --git a/.tool-versions b/.tool-versions
index 247f0919f..76460b240 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
# Versions of Gitaly dependencies managed by asdf.
-golang 1.20.6
+golang 1.21.0 1.20.6
ruby 3.1.4