From 8470649ecbc1bbdc315c34f15e220f1401bb78fc Mon Sep 17 00:00:00 2001 From: Livio Spring Date: Thu, 18 Jan 2024 09:16:54 +0100 Subject: [PATCH] chore: pin crdb version for unit tests (#7260) * chore: pin crdb version for unit tests * use latest 23.1 version * use latest available 23.1 version --- .github/workflows/build.yml | 1 + .github/workflows/core-unit-test.yml | 5 ++++- internal/eventstore/local_crdb_test.go | 2 +- internal/eventstore/repository/sql/local_crdb_test.go | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ce3ceccca..77eb8e02e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,6 +48,7 @@ jobs: go_version: "1.21" core_cache_key: ${{ needs.core.outputs.cache_key }} core_cache_path: ${{ needs.core.outputs.cache_path }} + crdb_version: "23.1.13" core-integration-test: needs: core diff --git a/.github/workflows/core-unit-test.yml b/.github/workflows/core-unit-test.yml index 675c3d0a1..0e69ba2de 100644 --- a/.github/workflows/core-unit-test.yml +++ b/.github/workflows/core-unit-test.yml @@ -12,6 +12,9 @@ on: core_cache_path: required: true type: string + crdb_version: + required: false + type: string jobs: test: @@ -51,7 +54,7 @@ jobs: - name: test if: ${{ steps.cache.outputs.cache-hit != 'true' }} - run: make core_unit_test + run: export ZITADEL_CRDB_VERSION="${{ inputs.crdb_version }}" && make core_unit_test - name: publish coverage uses: codecov/codecov-action@v3.1.4 diff --git a/internal/eventstore/local_crdb_test.go b/internal/eventstore/local_crdb_test.go index d77f6a3dd..d4f21dcca 100644 --- a/internal/eventstore/local_crdb_test.go +++ b/internal/eventstore/local_crdb_test.go @@ -27,7 +27,7 @@ var ( ) func TestMain(m *testing.M) { - ts, err := testserver.NewTestServer() + ts, err := testserver.NewTestServer(testserver.CustomVersionOpt(os.Getenv("ZITADEL_CRDB_VERSION"))) if err != nil { logging.WithFields("error", err).Fatal("unable to start db") } diff --git a/internal/eventstore/repository/sql/local_crdb_test.go b/internal/eventstore/repository/sql/local_crdb_test.go index 3eede324a..e357e8c40 100644 --- a/internal/eventstore/repository/sql/local_crdb_test.go +++ b/internal/eventstore/repository/sql/local_crdb_test.go @@ -20,7 +20,7 @@ var ( ) func TestMain(m *testing.M) { - ts, err := testserver.NewTestServer() + ts, err := testserver.NewTestServer(testserver.CustomVersionOpt(os.Getenv("ZITADEL_CRDB_VERSION"))) if err != nil { logging.WithFields("error", err).Fatal("unable to start db") }