Merge pull request #642 from voxpupuli/modulesync

modulesync 7.3.0

.github/workflows/ci.yml

@@ -4,7 +4,12 @@
 
 name: CI
 
-on: pull_request
+on:
+  pull_request: {}
+  push:
+    branches:
+      - main
+      - master
 
 concurrency:
   group: ${{ github.ref_name }}
@@ -13,4 +18,6 @@ concurrency:
 jobs:
   puppet:
     name: Puppet
-    uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v2
+    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
+    with:
+      pidfile_workaround: 'false'

.msync.yml

@@ -2,4 +2,4 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-modulesync_config_version: '7.2.0'
+modulesync_config_version: '7.3.0'

manifests/install.pp

@@ -40,6 +40,16 @@
         'present' => $r10k::version,
         'absent'  => 'absent',
       }
+      # we need to pin the faraday-net_http version for puppet 7
+      if versioncmp($facts['puppetversion'], '8.0.0') < 0 {
+        package { 'faraday':
+          ensure          => present,
+          provider        => $r10k::provider,
+          install_options => [
+            { '-v' => '2.8.1' },
+          ],
+        }
+      }
       package { $r10k::package_name:
         ensure          => $ensure,
         provider        => $r10k::provider,