Merge pull request #758 from go-kivik/zaprc

golang:rc images are no longer produced, so stop testing them
go-kivik · Sep 24, 2023 · 552d053 · 552d053
2 parents 964820c + f2a7689
commit 552d053
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -80,11 +80,6 @@ go-1.21:
   <<: *go_test_template
   image: golang:1.21
 
-go-rc:
-  <<: *go_test_template
-  image: golang:rc
-  allow_failure: true
-
 .gopherjs_test: &gopherjs_test_template
   <<: *go_test_template
   image: golang:1.18

diff --git a/cmd/kivik/cmd/root_test.go b/cmd/kivik/cmd/root_test.go
@@ -255,7 +255,7 @@ var standardReplacements = []testy.Replacement{
 		Replacement: `Host: XXX`,
 	},
 	{
-		Regexp:      regexp.MustCompile(`go\d\.\d+(\.|rc)\d+`),
+		Regexp:      regexp.MustCompile(`go\d\.\d+\.[\da-z-]+`),
 		Replacement: `goX.XX.X`,
 	},
 }