Merge pull request #80 from puppetlabs/Updating-BUNDLE_WITHOUT

Update bundle without usage
puppetlabs · Mar 1, 2024 · eda0fa1 · eda0fa1
2 parents 4e087d4 + a18620f
commit eda0fa1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/mend_ruby.yml b/.github/workflows/mend_ruby.yml
@@ -5,15 +5,15 @@ name: mend
 on:
   workflow_call:
 
-env:
-  BUNDLE_WITHOUT: release_prep
-
 jobs:
 
   mend:
     if: github.event.pull_request.head.repo.full_name == github.repository
     runs-on: "ubuntu-latest"
 
+    env:
+      BUNDLE_WITHOUT: release_prep
+
     steps:
 
       - name: "checkout"

diff --git a/.github/workflows/module_acceptance.yml b/.github/workflows/module_acceptance.yml
@@ -15,8 +15,6 @@ on:
         default: ''
         type: "string"
 
-env:
-  BUNDLE_WITHOUT: release_prep
 
 jobs:
 
@@ -26,6 +24,9 @@ jobs:
     outputs:
       acceptance_matrix: ${{ steps.get-matrix.outputs.matrix }}
 
+    env:
+      BUNDLE_WITHOUT: release_prep
+
     steps:
 
       - name: "Checkout"
@@ -58,6 +59,7 @@ jobs:
       matrix: ${{ fromJson( needs.setup_matrix.outputs.acceptance_matrix ) }}
 
     env:
+      BUNDLE_WITHOUT: release_prep
       PUPPET_GEM_VERSION: '~> 7.24'
       FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main'  # why is this set?
 

diff --git a/.github/workflows/module_ci.yml b/.github/workflows/module_ci.yml
@@ -15,8 +15,6 @@ on:
         default: ''
         type: "string"
 
-env:
-  BUNDLE_WITHOUT: release_prep
 
 jobs:
   setup_matrix:
@@ -25,6 +23,9 @@ jobs:
     outputs:
       spec_matrix: ${{ steps.get-matrix.outputs.spec_matrix }}
 
+    env:
+      BUNDLE_WITHOUT: release_prep
+
     steps:
 
       - name: "Checkout"
@@ -58,6 +59,7 @@ jobs:
       matrix: ${{ fromJson( needs.setup_matrix.outputs.spec_matrix ) }}
 
     env:
+      BUNDLE_WITHOUT: release_prep
       PUPPET_GEM_VERSION: ${{ matrix.puppet_version }}
       FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main'  # why is this set?
 

diff --git a/.github/workflows/module_release_prep.yml b/.github/workflows/module_release_prep.yml
@@ -12,14 +12,15 @@ on:
         required: true
         type: "string"
 
-env:
-  BUNDLE_WITHOUT: development:system_tests
 
 jobs:
   release_prep:
     name: "Release prep"
     runs-on: "ubuntu-20.04"
 
+    env:
+      BUNDLE_WITHOUT: development:system_tests
+
     steps:
 
       - name: "Checkout"