Merge pull request puppetlabs#2419 from beechtom/bug/apply-failures

(maint) Fix broken apply integration tests
beechtom · Dec 4, 2020 · fddcdd7
2 parents 0033501 + 0a861ab
commit fddcdd7
Show file tree

Hide file tree

Showing 10 changed files with 414 additions and 457 deletions.
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -33,5 +33,8 @@ jobs:
       - name: Install gems
         if: steps.cache.outputs.cache-hit != 'true'
         run: bundle install --jobs 4 --retry 3
+      - name: Update gems
+        if: steps.cache.outputs.cache-hit == 'true'
+        run: bundle update
       - name: Generate docs
         run: bundle exec rake docs:all
diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
@@ -37,6 +37,9 @@ jobs:
       - name: Install gems
         if: steps.cache.outputs.cache-hit != 'true'
         run: bundle install --jobs 4 --retry 3
+      - name: Update gems
+        if: steps.cache.outputs.cache-hit == 'true'
+        run: bundle update
       - name: Pre-test setup
         run: |
           echo 'runner:runner' | sudo chpasswd
@@ -72,6 +75,9 @@ jobs:
       - name: Install gems
         if: steps.cache.outputs.cache-hit != 'true'
         run: bundle install --jobs 4 --retry 3
+      - name: Update gems
+        if: steps.cache.outputs.cache-hit == 'true'
+        run: bundle update
       - name: Pre-test setup
         run: |
           docker-compose -f spec/docker-compose.yml build --parallel

diff --git a/.github/workflows/modules.yaml b/.github/workflows/modules.yaml
@@ -36,6 +36,9 @@ jobs:
       - name: Install gems
         if: steps.cache.outputs.cache-hit != 'true'
         run: bundle install --jobs 4 --retry 3
+      - name: Update gems
+        if: steps.cache.outputs.cache-hit == 'true'
+        run: bundle update
       - name: Run module tests
         run: bundle exec rake ci:modules
 
@@ -64,5 +67,8 @@ jobs:
       - name: Install gems
         if: steps.cache.outputs.cache-hit != 'true'
         run: bundle install --jobs 4 --retry 3
+      - name: Update gems
+        if: steps.cache.outputs.cache-hit == 'true'
+        run: bundle update
       - name: Run module tests
         run: bundle exec rake ci:modules
diff --git a/.github/workflows/schemas.yaml b/.github/workflows/schemas.yaml
@@ -41,6 +41,9 @@ jobs:
       - name: Install gems
         if: steps.cache.outputs.cache-hit != 'true'
         run: bundle install --jobs 4 --retry 3
+      - name: Update gems
+        if: steps.cache.outputs.cache-hit == 'true'
+        run: bundle update
       - name: Generate schemas
         run: bundle exec rake schemas:all
       - name: Compare changes

diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
@@ -44,6 +44,9 @@ jobs:
       - name: Install gems
         if: steps.cache.outputs.cache-hit != 'true'
         run: bundle install --jobs 4 --retry 3
+      - name: Update gems
+        if: steps.cache.outputs.cache-hit == 'true'
+        run: bundle update
       - name: Cache modules
         id: modules
         uses: actions/cache@v1
@@ -87,6 +90,9 @@ jobs:
       - name: Install gems
         if: steps.cache.outputs.cache-hit != 'true'
         run: bundle install --jobs 4 --retry 3
+      - name: Update gems
+        if: steps.cache.outputs.cache-hit == 'true'
+        run: bundle update
       - name: Cache modules
         id: modules