From 30ce4db749259db237bad890f27a1d1350c615e4 Mon Sep 17 00:00:00 2001 From: Daniel Kastl Date: Tue, 31 Oct 2023 11:54:32 +0900 Subject: [PATCH 1/3] Uses organisation variables for matrix config --- .github/workflows/test-postgis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-postgis.yml b/.github/workflows/test-postgis.yml index 717d388b..ed3f7fc4 100644 --- a/.github/workflows/test-postgis.yml +++ b/.github/workflows/test-postgis.yml @@ -2,6 +2,8 @@ name: Test with PostGIS env: PLUGIN_NAME: ${{ github.event.repository.name }} + REDMINE_VERSIONS: ${{ fromJson(vars.PLUGIN_TEST_MATRIX_REDMINE_VERSION) }} + RUBY_VERSIONS: ${{ fromJson(vars.PLUGIN_TEST_MATRIX_RUBY_VERSION) }} on: push: @@ -24,8 +26,8 @@ jobs: strategy: fail-fast: false matrix: - redmine_version: [5.0-stable, master] - ruby_version: ['3.0', '3.1'] + redmine_version: ${{ env.REDMINE_VERSIONS }} + ruby_version: ${{ env.RUBY_VERSIONS }} db_version: [12-3.0, 15-3.3] services: From e45c75afe985ea471dab815e59edb9b7cd290172 Mon Sep 17 00:00:00 2001 From: Daniel Kastl Date: Tue, 31 Oct 2023 12:07:03 +0900 Subject: [PATCH 2/3] Fixes syntax --- .github/workflows/test-postgis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-postgis.yml b/.github/workflows/test-postgis.yml index ed3f7fc4..4f41c938 100644 --- a/.github/workflows/test-postgis.yml +++ b/.github/workflows/test-postgis.yml @@ -2,8 +2,6 @@ name: Test with PostGIS env: PLUGIN_NAME: ${{ github.event.repository.name }} - REDMINE_VERSIONS: ${{ fromJson(vars.PLUGIN_TEST_MATRIX_REDMINE_VERSION) }} - RUBY_VERSIONS: ${{ fromJson(vars.PLUGIN_TEST_MATRIX_RUBY_VERSION) }} on: push: @@ -26,8 +24,8 @@ jobs: strategy: fail-fast: false matrix: - redmine_version: ${{ env.REDMINE_VERSIONS }} - ruby_version: ${{ env.RUBY_VERSIONS }} + redmine_version: ${{ vars.PLUGIN_TEST_MATRIX_REDMINE_VERSION }} + ruby_version: ${{ vars.PLUGIN_TEST_MATRIX_RUBY_VERSION }} db_version: [12-3.0, 15-3.3] services: From 9d50ccf8c6643443dc6bca467bbd962013feacb6 Mon Sep 17 00:00:00 2001 From: Daniel Kastl Date: Tue, 31 Oct 2023 12:26:55 +0900 Subject: [PATCH 3/3] Update test-postgis.yml --- .github/workflows/test-postgis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-postgis.yml b/.github/workflows/test-postgis.yml index 4f41c938..539d4b09 100644 --- a/.github/workflows/test-postgis.yml +++ b/.github/workflows/test-postgis.yml @@ -24,8 +24,8 @@ jobs: strategy: fail-fast: false matrix: - redmine_version: ${{ vars.PLUGIN_TEST_MATRIX_REDMINE_VERSION }} - ruby_version: ${{ vars.PLUGIN_TEST_MATRIX_RUBY_VERSION }} + redmine_version: ${{ fromJSON(vars.PLUGIN_TEST_MATRIX_REDMINE_VERSION) }} + ruby_version: ${{ fromJSON(vars.PLUGIN_TEST_MATRIX_RUBY_VERSION) }} db_version: [12-3.0, 15-3.3] services: