From a8952ca1130c01f9b572c9b326fb2b84e2e0ffb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= Date: Fri, 18 Oct 2024 16:57:33 +0200 Subject: [PATCH] build: clean up test matrices (#316) * build: clean up test matrices * chore: allow ActiveRecord 7.2.x * chore: pin to minor version * chore: remove AR 7.2 from list --- .../acceptance-tests-on-emulator.yaml | 12 ++--- .github/workflows/ci.yaml | 12 ++--- .../nightly-acceptance-tests-on-emulator.yaml | 47 +++-------------- .github/workflows/nightly-unit-tests.yaml | 50 +++---------------- 4 files changed, 21 insertions(+), 100 deletions(-) diff --git a/.github/workflows/acceptance-tests-on-emulator.yaml b/.github/workflows/acceptance-tests-on-emulator.yaml index aa12b42b..9341a7b1 100644 --- a/.github/workflows/acceptance-tests-on-emulator.yaml +++ b/.github/workflows/acceptance-tests-on-emulator.yaml @@ -19,17 +19,13 @@ jobs: max-parallel: 4 matrix: ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"] - ar: ["~> 6.0.6", "~> 6.1.7", "~> 7.0.4", "~> 7.1.0"] + ar: ["~> 6.1.0", "~> 7.0.0", "~> 7.1.0"] # Exclude combinations that are not supported. exclude: + - ruby: "2.7" + ar: "~> 7.2.0" - ruby: "3.0" - ar: "~> 6.0.6" - - ruby: "3.1" - ar: "~> 6.0.6" - - ruby: "3.2" - ar: "~> 6.0.6" - - ruby: "3.3" - ar: "~> 6.0.6" + ar: "~> 7.2.0" env: AR_VERSION: ${{ matrix.ar }} steps: diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 31b305e2..67ed1e75 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -11,17 +11,13 @@ jobs: max-parallel: 4 matrix: ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"] - ar: ["~> 6.0.6", "~> 6.1.7", "~> 7.0.4", "~> 7.1.0"] + ar: ["~> 6.1.0", "~> 7.0.0", "~> 7.1.0"] # Exclude combinations that are not supported. exclude: + - ruby: "2.7" + ar: "~> 7.2.0" - ruby: "3.0" - ar: "~> 6.0.6" - - ruby: "3.1" - ar: "~> 6.0.6" - - ruby: "3.2" - ar: "~> 6.0.6" - - ruby: "3.3" - ar: "~> 6.0.6" + ar: "~> 7.2.0" env: AR_VERSION: ${{ matrix.ar }} steps: diff --git a/.github/workflows/nightly-acceptance-tests-on-emulator.yaml b/.github/workflows/nightly-acceptance-tests-on-emulator.yaml index 283af308..e859466c 100644 --- a/.github/workflows/nightly-acceptance-tests-on-emulator.yaml +++ b/.github/workflows/nightly-acceptance-tests-on-emulator.yaml @@ -18,49 +18,14 @@ jobs: strategy: max-parallel: 4 matrix: - # Run acceptance tests all supported combinations of Ruby and ActiveRecord. - ruby: [2.7, 3.0, 3.1, 3.2, 3.3] - ar: [6.0.0, 6.0.1, 6.0.2.2, 6.0.3.7, 6.0.4, 6.1.3.2, 6.1.4.7, 6.1.5.1, 6.1.6.1, 7.0.2.4, 7.0.3.1, 7.0.4, 7.0.5, 7.0.6, 7.0.7, 7.1.0, 7.1.1, 7.1.2] + ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"] + ar: ["~> 6.1.0", "~> 7.0.0", "~> 7.1.0"] # Exclude combinations that are not supported. exclude: - - ruby: 3.0 - ar: 6.0.0 - - ruby: 3.0 - ar: 6.0.1 - - ruby: 3.0 - ar: 6.0.2.2 - - ruby: 3.0 - ar: 6.0.3.7 - - ruby: 3.0 - ar: 6.0.4 - - ruby: 3.1 - ar: 6.0.0 - - ruby: 3.1 - ar: 6.0.1 - - ruby: 3.1 - ar: 6.0.2.2 - - ruby: 3.1 - ar: 6.0.3.7 - - ruby: 3.1 - ar: 6.0.4 - - ruby: 3.2 - ar: 6.0.0 - - ruby: 3.2 - ar: 6.0.1 - - ruby: 3.2 - ar: 6.0.2.2 - - ruby: 3.2 - ar: 6.0.3.7 - - ruby: 3.2 - ar: 6.0.4 - - ruby: 3.3 - ar: 6.0.0 - - ruby: 3.3 - ar: 6.0.1 - - ruby: 3.3 - ar: 6.0.2.2 - - ruby: 3.3 - ar: 6.0.3.7 + - ruby: "2.7" + ar: "~> 7.2.0" + - ruby: "3.0" + ar: "~> 7.2.0" env: AR_VERSION: ${{ matrix.ar }} steps: diff --git a/.github/workflows/nightly-unit-tests.yaml b/.github/workflows/nightly-unit-tests.yaml index 98609791..4d90b8fe 100644 --- a/.github/workflows/nightly-unit-tests.yaml +++ b/.github/workflows/nightly-unit-tests.yaml @@ -10,51 +10,15 @@ jobs: strategy: max-parallel: 4 matrix: - # Run unit tests all supported combinations of Ruby and ActiveRecord. - ruby: [2.7, 3.0, 3.1, 3.2, 3.3] - ar: [6.0.0, 6.0.1, 6.0.2.2, 6.0.3.7, 6.0.4, 6.1.3.2, 6.1.4.7, 6.1.5.1, 6.1.6.1, 7.0.2.4, 7.0.3.1, 7.0.4, 7.0.5, 7.1.0, 7.1.1, 7.1.2] + # Run acceptance tests all supported combinations of Ruby and ActiveRecord. + ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"] + ar: ["~> 6.1.0", "~> 7.0.0", "~> 7.1.0"] # Exclude combinations that are not supported. exclude: - - ruby: 3.0 - ar: 6.0.0 - - ruby: 3.0 - ar: 6.0.1 - - ruby: 3.0 - ar: 6.0.2.2 - - ruby: 3.0 - ar: 6.0.3.7 - - ruby: 3.0 - ar: 6.0.4 - - ruby: 3.1 - ar: 6.0.0 - - ruby: 3.1 - ar: 6.0.1 - - ruby: 3.1 - ar: 6.0.2.2 - - ruby: 3.1 - ar: 6.0.3.7 - - ruby: 3.1 - ar: 6.0.4 - - ruby: 3.2 - ar: 6.0.0 - - ruby: 3.2 - ar: 6.0.1 - - ruby: 3.2 - ar: 6.0.2.2 - - ruby: 3.2 - ar: 6.0.3.7 - - ruby: 3.2 - ar: 6.0.4 - - ruby: 3.3 - ar: 6.0.0 - - ruby: 3.3 - ar: 6.0.1 - - ruby: 3.3 - ar: 6.0.2.2 - - ruby: 3.3 - ar: 6.0.3.7 - - ruby: 3.3 - ar: 6.0.4 + - ruby: "2.7" + ar: "~> 7.2.0" + - ruby: "3.0" + ar: "~> 7.2.0" env: AR_VERSION: ${{ matrix.ar }} steps: