From 5dd816ae0186f20dfa905997a64104db9a8221c7 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Wed, 7 Jan 2026 22:30:14 +0100 Subject: [PATCH] Tweaks for the generated CI matrix --- .github/workflows/test.yml | 7 ------- generate-test-matrix.rb | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 097b964..a15c2b5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,32 +15,25 @@ permissions: jobs: test-matrix: runs-on: ubuntu-latest - outputs: matrix: ${{ steps.matrix.outputs.matrix }} - steps: - uses: actions/checkout@v6 - - uses: ./ with: ruby-version: ruby - - id: matrix run: echo "matrix=$(ruby generate-test-matrix.rb)" | tee -a "$GITHUB_OUTPUT" - - run: echo "$MATRIX" | yq -P env: MATRIX: ${{ steps.matrix.outputs.matrix }} test: needs: [test-matrix] - strategy: fail-fast: false matrix: include: ${{ fromJSON(needs.test-matrix.outputs.matrix) }} - name: ${{ matrix.os }} ${{ matrix.ruby }} runs-on: ${{ matrix.os }} steps: diff --git a/generate-test-matrix.rb b/generate-test-matrix.rb index 93fbea5..6380887 100644 --- a/generate-test-matrix.rb +++ b/generate-test-matrix.rb @@ -74,4 +74,4 @@ matrix -= ubuntu_arm64_runners.product(%w[1.9 2.0 2.1 2.2]) # RubyInstaller windows-arm64 builds only exist for Ruby 3.4+ matrix -= windows_arm64_runners.product(%w[2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 3.0 3.1 3.2 3.3]) -puts(JSON.generate(matrix.sort.collect { |os, ruby| { os: os, ruby: ruby } })) +puts(JSON.generate(matrix.sort.map { |os, ruby| { os:, ruby: } }))