Merge pull request #1351 from puppetlabs/maint-add_puppet_gem_input

(maint) - add puppet version input to workflows
puppetlabs · May 8, 2024 · 1fddb1c · 1fddb1c
2 parents b800d3f + c0f2637
commit 1fddb1c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git 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
@@ -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 }}