Skip to content

Commit 6b496e2

Browse files
aeneasrory-bot
authored andcommitted
chore: upgrade crdb to v25.2 everywhere & deflake CI!
GitOrigin-RevId: 5eb5923e0792eea31ddb8ef34d28292c2c9d54f7
1 parent a398b64 commit 6b496e2

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
steps:
5858
- run: |
5959
docker create --name cockroach -p 26257:26257 \
60-
cockroachdb/cockroach:latest-v25.1 start-single-node --insecure
60+
cockroachdb/cockroach:latest-v25.2 start-single-node --insecure
6161
docker start cockroach
6262
name: Start CockroachDB
6363
- uses: ory/ci/checkout@master
@@ -143,7 +143,7 @@ jobs:
143143
steps:
144144
- run: |
145145
docker create --name cockroach -p 26257:26257 \
146-
cockroachdb/cockroach:latest-v25.1 start-single-node --insecure
146+
cockroachdb/cockroach:latest-v25.2 start-single-node --insecure
147147
docker start cockroach
148148
name: Start CockroachDB
149149
- uses: ory/ci/checkout@master

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ test-resetdb: node_modules
4949
docker rm --force --volumes hydra_test_database_cockroach || true
5050
docker run --rm --name hydra_test_database_mysql -p 3444:3306 -e MYSQL_ROOT_PASSWORD=secret -d mysql:8.0
5151
docker run --rm --name hydra_test_database_postgres -p 3445:5432 -e POSTGRES_PASSWORD=secret -e POSTGRES_DB=postgres -d postgres:16
52-
docker run --rm --name hydra_test_database_cockroach -p 3446:26257 -d cockroachdb/cockroach:latest-v25.1 start-single-node --insecure
52+
docker run --rm --name hydra_test_database_cockroach -p 3446:26257 -d cockroachdb/cockroach:latest-v25.2 start-single-node --insecure
5353

5454
# Build local docker images
5555
.PHONY: docker

oryx/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ resetdb:
3636
docker rm -f hydra_test_database_cockroach || true
3737
docker run --rm --name hydra_test_database_mysql -p 3444:3306 -e MYSQL_ROOT_PASSWORD=secret -d mysql:8.0
3838
docker run --rm --name hydra_test_database_postgres -p 3445:5432 -e POSTGRES_PASSWORD=secret -e POSTGRES_DB=hydra -d postgres:11.8
39-
docker run --rm --name hydra_test_database_cockroach -p 3446:26257 -d cockroachdb/cockroach:v21.1.21 start-single-node --insecure
39+
docker run --rm --name hydra_test_database_cockroach -p 3446:26257 -d cockroachdb/cockroach:latest-v25.2 start-single-node --insecure
4040

4141
.PHONY: lint
4242
lint: .bin/golangci-lint

quickstart-cockroach.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ services:
1717
environment:
1818
- DSN=cockroach://root@cockroachd:26257/defaultdb?sslmode=disable&max_conns=20&max_idle_conns=4
1919
cockroachd:
20-
image: cockroachdb/cockroach:latest-v25.1
20+
image: cockroachdb/cockroach:latest-v25.2
2121
ports:
2222
- "26257:26257"
2323
command: start-single-node --insecure

scripts/db-diff.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ function dump_cockroach {
9696
sleep 4
9797
go run . migrate sql up "$TEST_DATABASE_COCKROACHDB" --yes > /dev/null || true
9898
hydra::util::parse-connection-url "${TEST_DATABASE_COCKROACHDB}"
99-
docker run --rm --net=host -it cockroachdb/cockroach:latest-v25.1 dump --dump-all --dump-mode=schema --insecure --user="${DB_USER}" --host="${DB_HOST}" --port="${DB_PORT}"
99+
docker run --rm --net=host -it cockroachdb/cockroach:latest-v25.2 dump --dump-all --dump-mode=schema --insecure --user="${DB_USER}" --host="${DB_HOST}" --port="${DB_PORT}"
100100
}
101101

102102
function dump_sqlite {

test/e2e/docker-compose.cockroach.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ services:
1515
- DSN=cockroach://root@cockroachd:26257/defaultdb?sslmode=disable&max_conns=20&max_idle_conns=4
1616

1717
cockroachd:
18-
image: cockroachdb/cockroach:latest-v25.1
18+
image: cockroachdb/cockroach:latest-v25.2
1919
ports:
2020
- "26257:26257"
2121
command: start-single-node --insecure

0 commit comments

Comments
 (0)