From fa2e81a658950232c48e90a380bbd81aec0a7431 Mon Sep 17 00:00:00 2001 From: Craig Gumbley Date: Thu, 13 Apr 2023 11:52:11 +0100 Subject: [PATCH 1/2] (MAINT) Fix gem env vars --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 6e64c03db..4eeb52462 100644 --- a/Gemfile +++ b/Gemfile @@ -23,8 +23,8 @@ end group :test do - gem 'puppet', *location_for(ENV['PUPPET_LOCATION']) - gem 'facter', *location_for(ENV['FACTER_LOCATION']) + gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION']) + gem 'facter', *location_for(ENV['FACTER_GEM_VERSION']) gem 'json_pure' gem 'sync' From 3daccb4c1d11eb54631a9c1b25517ecc1e6f7fa1 Mon Sep 17 00:00:00 2001 From: Craig Gumbley Date: Thu, 13 Apr 2023 12:00:06 +0100 Subject: [PATCH 2/2] (MAINT) Update matrix for Puppet 8 --- .github/workflows/ci.yml | 8 +++++--- .github/workflows/nightly.yml | 10 ++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf906ea4e..34014744b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,9 +14,11 @@ jobs: ruby_version: - "2.7" - "3.2" - puppet_gem_version: - - '~> 7.0' - - 'https://github.com/puppetlabs/puppet' # puppet8 + include: + - ruby-version: '2.7' + puppet_gem_version: '~> 7.0' + - ruby_version: '3.2' + puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8' runs_on: - "ubuntu-latest" - "windows-latest" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index ed5439a80..cfbc7dfd8 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -11,11 +11,13 @@ jobs: fail-fast: false matrix: ruby_version: - - "2.5" - "2.7" - puppet_gem_version: - - '~> 6.0' - - '~> 7.0' + - "3.2" + include: + - ruby-version: '2.7' + puppet_gem_version: '~> 7.0' + - ruby_version: '3.2' + puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8' runs_on: - "ubuntu-latest" - "windows-latest"