puppet_metadata 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1812a9565d5558aea69c47b403fd31788417b995ad8c4ef5349ddee10d18529c
-  data.tar.gz: 54dda6a4915469ce27d0d2b9a1c43fbcee5cfdc2314dfc3fa8358afca9d303da
+  metadata.gz: 747e0f610eab5945e5394f6a8016b0208c9be6192dba0ebeca8a54adc50905f1
+  data.tar.gz: 7f1faa8c180dab26899c9664cb43c0990fb0f8d416d768d7542cd936d086b0b6
 SHA512:
-  metadata.gz: 49675f7c180f2300e05c3018cb6d0c9f064d74b5f95fee222d73e7f83c385a8b4a839779462163a11022f9c700d115839c1d79d239a0f5988a1cbf5c3dea344d
-  data.tar.gz: be883a1b3af62b048436c263afd6dc4a0963fc5345d9a8e69f63af96e52f84670c5ec1d63ef212a371ed2044f62e21f2c5a49e9016f0c1c108083a12efbd7a7e
+  metadata.gz: 4572e37f989abc32cc51393c588e26c513afff9c497ca11f07cbe7897e6ea02399728b8354d5dd4b0268cf762693deff46482e0b2940e5c026a9931513045bfe
+  data.tar.gz: 8c72e2c47b3a52d7bb478df00e106e484446a146d23281c61a04ba3cbe77e1f69ffa9cc531c8b218a4b62c1c038de7bd325910362157634789af1fed999e694e

data/lib/puppet_metadata/beaker.rb

@@ -65,7 +65,7 @@ module PuppetMetadata
       # Return whether a Beaker setfile can be generated for the given OS
       # @param [String] os The operating system
       def os_supported?(os)
-        ['CentOS', 'Fedora', 'Debian', 'Ubuntu'].include?(os)
+        ['Archlinux', 'CentOS', 'Fedora', 'Debian', 'Ubuntu'].include?(os)
       end
 
       private

data/lib/puppet_metadata/github_actions.rb

@@ -52,25 +52,42 @@ module PuppetMetadata
       end.compact
     end
 
-    def github_action_test_matrix(use_fqdn: false, pidfile_workaround: false)
-      metadata.operatingsystems.each_with_object([]) do |(os, releases), matrix_include|
-        releases&.each do |release|
-          puppet_major_versions.each do |puppet_version|
-            next unless AIO.has_aio_build?(os, release, puppet_version[:value])
-
-            setfile = PuppetMetadata::Beaker.os_release_to_setfile(os, release, use_fqdn: use_fqdn, pidfile_workaround: pidfile_workaround)
-            next unless setfile
+    def beaker_os_releases
+      majors = puppet_major_versions
 
-            matrix_include << {
-              setfile: {
-                name: setfile[1],
-                value: setfile[0],
-              },
-              puppet: puppet_version
-            }
+      metadata.operatingsystems.each do |os, releases|
+        case os
+        when 'Archlinux', 'Gentoo'
+          yield [os, 'rolling', majors.max_by { |v| v[:value] }]
+        else
+          releases&.each do |release|
+            majors.each do |puppet_version|
+              if AIO.has_aio_build?(os, release, puppet_version[:value])
+                yield [os, release, puppet_version]
+              end
+            end
           end
         end
       end
     end
+
+    def github_action_test_matrix(use_fqdn: false, pidfile_workaround: false)
+      matrix_include = []
+
+      beaker_os_releases do |os, release, puppet_version|
+        setfile = PuppetMetadata::Beaker.os_release_to_setfile(os, release, use_fqdn: use_fqdn, pidfile_workaround: pidfile_workaround)
+        next unless setfile
+
+        matrix_include << {
+          setfile: {
+            name: setfile[1],
+            value: setfile[0],
+          },
+          puppet: puppet_version
+        }
+      end
+
+      matrix_include
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet_metadata
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Vox Pupuli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metadata-json-lint