From c0f2637a0e8701eac6c4a12dc2c82f63c65fd0e1 Mon Sep 17 00:00:00 2001
From: jordanbreen28 <jordan.breen@perforce.com>
Date: Wed, 8 May 2024 10:38:01 +0100
Subject: [PATCH] (maint) - add puppet version input to workflows

---
 .github/workflows/ci.yml      | 12 ++++++++++++
 .github/workflows/nightly.yml | 13 +++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0a2d05ed1..692ff5b00 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,12 +22,18 @@ jobs:
         ruby_version:
           - "2.7"
           - "3.2"
+        include:
+          - puppet_gem_version: "~> 7.0"
+            ruby_version: "2.7"
+          - puppet_gem_version: "~> 8.0"
+            ruby_version: "3.2"
     name: "spec (ruby ${{ matrix.ruby_version }})"
     uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
     secrets: "inherit"
     with:
       rake_task: 'spec:coverage'
       ruby_version: ${{ matrix.ruby_version }}
+      puppet_gem_version: ${{ matrix.puppet_gem_version }}
 
   acceptance:
     needs: "spec"
@@ -40,10 +46,16 @@ jobs:
         ruby_version:
           - "2.7"
           - "3.2"
+        include:
+          - puppet_gem_version: "~> 7.0"
+            ruby_version: "2.7"
+          - puppet_gem_version: "~> 8.0"
+            ruby_version: "3.2"
     name: "acceptance (ruby ${{ matrix.ruby_version }} | ${{ matrix.os }})"
     uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
     secrets: "inherit"
     with:
       ruby_version: ${{ matrix.ruby_version }}
+      puppet_version: ${{ matrix.puppet_gem_version }}
       rake_task: 'acceptance:local'
       runs_on: ${{ matrix.os }}
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 78640b73d..849422c75 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -14,11 +14,18 @@ jobs:
         ruby_version:
           - "2.7"
           - "3.2"
+        include:
+          - puppet_gem_version: "~> 7.0"
+            ruby_version: "2.7"
+          - puppet_gem_version: "~> 8.0"
+            ruby_version: "3.2"
     name: "spec (ruby ${{ matrix.ruby_version }})"
     uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
     secrets: "inherit"
     with:
+      rake_task: 'spec:coverage'
       ruby_version: ${{ matrix.ruby_version }}
+      puppet_gem_version: ${{ matrix.puppet_gem_version }}
 
   acceptance:
     needs: "spec"
@@ -31,11 +38,17 @@ jobs:
         ruby_version:
           - "2.7"
           - "3.2"
+        include:
+          - puppet_gem_version: "~> 7.0"
+            ruby_version: "2.7"
+          - puppet_gem_version: "~> 8.0"
+            ruby_version: "3.2"
     name: "acceptance (ruby ${{ matrix.ruby_version }} | ${{ matrix.os }})"
     uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
     secrets: "inherit"
     with:
       ruby_version: ${{ matrix.ruby_version }}
+      puppet_version: ${{ matrix.puppet_gem_version }}
       rake_task: 'acceptance:local'
       runs_on: ${{ matrix.os }}