From 8d1a875ac2d5cb725aa71648d0259fb11108bedf Mon Sep 17 00:00:00 2001 From: Jacob Buchanan Date: Mon, 25 Nov 2024 10:22:09 +0000 Subject: [PATCH 1/4] (maint) Fix weird bundler resolution of Faraday in orchestrator client 0.7.1 by pinning to an old version until fixed --- .sync.yml | 5 +++++ Gemfile | 1 + 2 files changed, 6 insertions(+) diff --git a/.sync.yml b/.sync.yml index 1939bf43..66cd9126 100644 --- a/.sync.yml +++ b/.sync.yml @@ -10,6 +10,11 @@ Gemfile: version: '1.16.4' # Pinned to latest bug fix version - gem: 'octokit' version: '4.21.0' # Locked due to https://github.com/octokit/octokit.rb/issues/1391 + # The Faraday requirements in orchestrator_client 0.7.1 causes Bundler to + # resolve the dependency in unexpected ways and causes issues in CI + - gem: 'orchestrator_client' + version: '< 0.7.1' + condition: 'ENV["GEM_BOLT"]' Rakefile: changelog_since_tag: '2.5.0' default_disabled_lint_checks: ['strict_indent','manifest_whitespace_missing_newline_end_of_file'] diff --git a/Gemfile b/Gemfile index d1825623..70230975 100644 --- a/Gemfile +++ b/Gemfile @@ -38,6 +38,7 @@ group :development do gem "bolt", '>= 3.27.2', require: false gem "github_changelog_generator", '1.16.4', require: false gem "octokit", '4.21.0', require: false + gem "orchestrator_client", '< 0.7.1', require: false if ENV["GEM_BOLT"] end group :system_tests do gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] From b1c637c1679fcea4c2b820a6161e15f471116ec9 Mon Sep 17 00:00:00 2001 From: jhbuchanan45 Date: Mon, 25 Nov 2024 10:25:58 +0000 Subject: [PATCH 2/4] Apply Yamlfix format changes. --- .sync.yml | 53 ++++++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/.sync.yml b/.sync.yml index 66cd9126..48b3a237 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,41 +1,44 @@ --- Gemfile: required: - ':development': - - gem: 'bolt' + :development: + - gem: bolt version: '>= 3.10.0' optional: - ':development': - - gem: 'github_changelog_generator' - version: '1.16.4' # Pinned to latest bug fix version - - gem: 'octokit' - version: '4.21.0' # Locked due to https://github.com/octokit/octokit.rb/issues/1391 + :development: + - gem: github_changelog_generator + version: 1.16.4 # Pinned to latest bug fix version + - gem: octokit + version: 4.21.0 # Locked due to https://github.com/octokit/octokit.rb/issues/1391 # The Faraday requirements in orchestrator_client 0.7.1 causes Bundler to # resolve the dependency in unexpected ways and causes issues in CI - - gem: 'orchestrator_client' - version: '< 0.7.1' - condition: 'ENV["GEM_BOLT"]' + - gem: orchestrator_client + version: < 0.7.1 + condition: ENV["GEM_BOLT"] Rakefile: - changelog_since_tag: '2.5.0' - default_disabled_lint_checks: ['strict_indent','manifest_whitespace_missing_newline_end_of_file'] + changelog_since_tag: 2.5.0 + default_disabled_lint_checks: + - strict_indent + - manifest_whitespace_missing_newline_end_of_file extras: - - 'PuppetSyntax.exclude_paths = ["plans/**/*.pp", "spec/acceptance/**/plans/**/*.pp", "vendor/**/*"]' + - PuppetSyntax.exclude_paths = ["plans/**/*.pp", "spec/acceptance/**/plans/**/*.pp", + "vendor/**/*"] spec/spec_helper.rb: - mock_with: ':rspec' + mock_with: :rspec .gitignore: paths: - - '.rerun.json' + - .rerun.json - '*.tar.gz' - - '.modules/' - - '.plan_cache.json' - - '.resource_types/' - - 'bolt-debug.log' - - 'spec/docker/**/*.tar.gz' - - 'spec/docker/**/*.asc' - - 'spec/docker/**/files/puppet-enterprise*' - - 'spec/docker/.task_cache.json' + - .modules/ + - .plan_cache.json + - .resource_types/ + - bolt-debug.log + - spec/docker/**/*.tar.gz + - spec/docker/**/*.asc + - spec/docker/**/files/puppet-enterprise* + - spec/docker/.task_cache.json .github/workflows/auto_release.yml: - unmanaged: false + unmanaged: false .github/workflows/release.yml: unmanaged: false .github/workflows/spec.yml: @@ -46,7 +49,7 @@ spec/spec_helper.rb: unmanaged: false .travis.yml: delete: true -".gitlab-ci.yml": +.gitlab-ci.yml: delete: true appveyor.yml: delete: true From f60536ba67a714e84d5c6a9f8186421d64300ccc Mon Sep 17 00:00:00 2001 From: Jacob Buchanan Date: Mon, 25 Nov 2024 10:30:56 +0000 Subject: [PATCH 3/4] (maint) Try not relying on BOLT_GEM to set contraints --- .sync.yml | 1 - Gemfile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.sync.yml b/.sync.yml index 48b3a237..322554a2 100644 --- a/.sync.yml +++ b/.sync.yml @@ -14,7 +14,6 @@ Gemfile: # resolve the dependency in unexpected ways and causes issues in CI - gem: orchestrator_client version: < 0.7.1 - condition: ENV["GEM_BOLT"] Rakefile: changelog_since_tag: 2.5.0 default_disabled_lint_checks: diff --git a/Gemfile b/Gemfile index 70230975..38a26f68 100644 --- a/Gemfile +++ b/Gemfile @@ -38,7 +38,7 @@ group :development do gem "bolt", '>= 3.27.2', require: false gem "github_changelog_generator", '1.16.4', require: false gem "octokit", '4.21.0', require: false - gem "orchestrator_client", '< 0.7.1', require: false if ENV["GEM_BOLT"] + gem "orchestrator_client", '< 0.7.1', require: false end group :system_tests do gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] From 340509ba39a018425dbf5cf111f9d8eebbc4c846 Mon Sep 17 00:00:00 2001 From: Jacob Buchanan Date: Mon, 25 Nov 2024 13:51:50 +0000 Subject: [PATCH 4/4] (maint) Bump ruby_task_helper to version 1.0.0 to fix CI error and support puppet 8 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 1a9696aa..ca352134 100644 --- a/metadata.json +++ b/metadata.json @@ -34,7 +34,7 @@ }, { "name": "puppetlabs/ruby_task_helper", - "version_requirement": ">= 0.6.1 < 1.0.0" + "version_requirement": ">= 1.0.0 < 2.0.0" } ], "operatingsystem_support": [