From d99b1c44172c2701307cca26bd0c59c61d4eff49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuli=20Sepp=C3=A4nen?= Date: Fri, 21 Apr 2023 14:06:59 +0300 Subject: [PATCH] Try puppetlabs ci.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Samuli Seppänen --- ...d-issues-with-the-Ubuntu-22.04-image.patch | 27 +++++++++++++++ .github/workflows/ci.yml | 20 ++++------- .sync.yml | 18 +++++----- Gemfile | 34 ++++++++++++------- 4 files changed, 66 insertions(+), 33 deletions(-) create mode 100644 .github/workflows/0001-GHA-work-around-issues-with-the-Ubuntu-22.04-image.patch diff --git a/.github/workflows/0001-GHA-work-around-issues-with-the-Ubuntu-22.04-image.patch b/.github/workflows/0001-GHA-work-around-issues-with-the-Ubuntu-22.04-image.patch new file mode 100644 index 00000000..a8ae7211 --- /dev/null +++ b/.github/workflows/0001-GHA-work-around-issues-with-the-Ubuntu-22.04-image.patch @@ -0,0 +1,27 @@ +From 3f556cd555bab3c3da4888dbcd5fc4d4a364e814 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Samuli=20Sepp=C3=A4nen?= +Date: Mon, 23 Jan 2023 11:41:55 +0200 +Subject: [PATCH] GHA: work around issues with the Ubuntu 22.04 image +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +URL: https://github.com/voxpupuli/gha-puppet/issues/23 +Signed-off-by: Samuli Seppänen +--- + .github/workflows/ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml +index 49981e3..e4a9392 100644 +--- a/.github/workflows/ci.yml ++++ b/.github/workflows/ci.yml +@@ -13,4 +13,4 @@ concurrency: + jobs: + puppet: + name: Puppet +- uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v1 ++ uses: Puppet-Finland/gha-puppet/.github/workflows/basic.yml@1.0.1 +-- +2.37.3 + diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 49981e36..05510ee0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,16 +1,10 @@ ---- -# Managed by modulesync - DO NOT EDIT -# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ - -name: CI +name: "ci" on: pull_request - -concurrency: - group: ${{ github.ref_name }} - cancel-in-progress: true - + jobs: - puppet: - name: Puppet - uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v1 + Spec: + uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main" + with: + runs_on: "ubuntu-20.04" + secrets: "inherit" diff --git a/.sync.yml b/.sync.yml index d7adbff7..d7d0b794 100644 --- a/.sync.yml +++ b/.sync.yml @@ -13,11 +13,13 @@ .github/SECURITY.md: delete: true -Gemfile: - required: - ':test': - #- gem: puppet - - gem: puppet_metadata - - gem: puppetlabs_spec_helper - #- gem: rubocop - - gem: github_changelog_generator + #Gemfile: + # required: + # ':development': '---' + # required: + # ':test': + # #- gem: puppet + # - gem: puppet_metadata + # - gem: puppetlabs_spec_helper + # #- gem: rubocop + # - gem: github_changelog_generator diff --git a/Gemfile b/Gemfile index 250bcd86..4eaa0c3e 100644 --- a/Gemfile +++ b/Gemfile @@ -13,23 +13,33 @@ def location_for(place_or_version, fake_version = nil) end end - +group :development do + gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "json", '= 2.5.1', require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "voxpupuli-puppet-lint-plugins", '~> 4.0', require: false + gem "facterdb", '~> 1.18', require: false + gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0', require: false + gem "puppetlabs_spec_helper", '~> 5.0', require: false + gem "rspec-puppet-facts", '~> 2.0', require: false + gem "codecov", '~> 0.2', require: false + gem "dependency_checker", '~> 0.2', require: false + gem "parallel_tests", '= 3.12.1', require: false + gem "pry", '~> 0.10', require: false + gem "simplecov-console", '~> 0.5', require: false + gem "puppet-debugger", '~> 1.0', require: false + gem "rubocop", '= 1.6.1', require: false + gem "rubocop-performance", '= 1.9.1', require: false + gem "rubocop-rspec", '= 2.0.1', require: false + gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] +end group :system_tests do gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby, :x64_mingw] gem "serverspec", '~> 2.41', require: false end -group :test do - gem "github_changelog_generator", require: false - gem "parallel_tests", require: false - gem "puppet_metadata", require: false - gem "puppetlabs_spec_helper", require: false - gem "rspec-puppet-facts", require: false - gem "rubocop", require: false - gem "rubocop-performance", require: false - gem "rubocop-rspec", require: false -end - puppet_version = ENV['PUPPET_GEM_VERSION'] facter_version = ENV['FACTER_GEM_VERSION'] hiera_version = ENV['HIERA_GEM_VERSION']