From 488c7e344cb99bceb40b22ce626f4ac45371fc09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hoo=20Sooyean=20=28=E4=BD=95=E6=9B=B8=E6=B7=B5=29?=
 <Sooyean.hoo@perforce.com>
Date: Mon, 19 Aug 2024 10:59:40 +0800
Subject: [PATCH] Remove hardcoder version of ruby and puppet and replaced with
 values generated by matrix_from_metadata_v2

---
 .github/workflows/module_acceptance.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/module_acceptance.yml b/.github/workflows/module_acceptance.yml
index 08de0ae..6443ec7 100644
--- a/.github/workflows/module_acceptance.yml
+++ b/.github/workflows/module_acceptance.yml
@@ -30,6 +30,8 @@ jobs:
     runs-on: ${{ inputs.runs_on }}
     outputs:
       acceptance_matrix: ${{ steps.get-matrix.outputs.matrix }}
+      ruby_version: ${{ steps.get-puppet_ruby_version.outputs.ruby_version }}
+      puppet_version: ${{ steps.get-puppet_ruby_version.outputs.puppet_version }}
 
     env:
       BUNDLE_WITHOUT: release_prep
@@ -56,8 +58,13 @@ jobs:
         run: |
           bundle exec matrix_from_metadata_v2 ${{ inputs.flags }}
 
+      - name: Setup Ruby Version and Setup Puppet Version
+        id: get-puppet_ruby_version
+        run: |
+          echo ${{ toJSON(steps.get-matrix.outputs.spec_matrix ) }} | jq -r '.include | .[0] | to_entries[] | "\(.key)=\(.value)"'  >> $GITHUB_OUTPUT
+
   acceptance:
-    name: "Acceptance tests (${{matrix.platforms.label}}, ${{matrix.collection}})"
+    name: "Acceptance tests (${{matrix.platforms.label}}, ${{matrix.collection}}) - ruby: ${{needs.setup_matrix.outputs.ruby_version}} puppet: ${{needs.setup_matrix.outputs.puppet_version}} "
     needs: "setup_matrix"
     runs-on: ${{ inputs.runs_on }}
     timeout-minutes: 180
@@ -67,7 +74,7 @@ jobs:
 
     env:
       BUNDLE_WITHOUT: release_prep
-      PUPPET_GEM_VERSION: '~> 7.24'
+      PUPPET_GEM_VERSION: ${{needs.setup_matrix.outputs.puppet_version}}
       FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main'  # why is this set?
 
     steps:
@@ -88,7 +95,7 @@ jobs:
       - name: "Setup ruby"
         uses: "ruby/setup-ruby@v1"
         with:
-          ruby-version: "2.7"
+          ruby-version: ${{needs.setup_matrix.outputs.ruby_version}}
           bundler-cache: true
 
       - name: "Bundle environment"