From a46a2cdd0b3fbc282d63fb3d8dd38cb4ccb9dde1 Mon Sep 17 00:00:00 2001 From: Andrew Werner Date: Tue, 19 Jul 2022 13:59:10 -0400 Subject: [PATCH 1/2] backupccl/backuprand: add geos Sometimes random data invokes geospatial functions. See [this failure](https://teamcity.cockroachdb.com/buildConfiguration/Cockroach_GitHubCiOptional/5788685?showRootCauses=false&expandBuildChangesSection=true&expandBuildProblemsSection=true&expandBuildTestsSection=true) Release note: None --- pkg/ccl/backupccl/backuprand/BUILD.bazel | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/ccl/backupccl/backuprand/BUILD.bazel b/pkg/ccl/backupccl/backuprand/BUILD.bazel index 49d4e4dcd6cc..107389b86c85 100644 --- a/pkg/ccl/backupccl/backuprand/BUILD.bazel +++ b/pkg/ccl/backupccl/backuprand/BUILD.bazel @@ -7,6 +7,7 @@ go_test( "backup_rand_test.go", "main_test.go", ], + data = ["//c-deps:libgeos"], deps = [ "//pkg/base", "//pkg/ccl", From 2254799c10e841148b0984dc026a287a06eaf433 Mon Sep 17 00:00:00 2001 From: Celia La Date: Tue, 19 Jul 2022 12:27:39 -0700 Subject: [PATCH 2/2] roachtest: bump version to 22.1.4 Release note: None --- pkg/cmd/roachtest/tests/predecessor_version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cmd/roachtest/tests/predecessor_version.json b/pkg/cmd/roachtest/tests/predecessor_version.json index 883d4ea30462..6a97c97dd692 100644 --- a/pkg/cmd/roachtest/tests/predecessor_version.json +++ b/pkg/cmd/roachtest/tests/predecessor_version.json @@ -8,5 +8,5 @@ "21.1": "20.2.12", "21.2": "21.1.12", "22.1": "21.2.7", - "22.2": "22.1.3" + "22.2": "22.1.4" }