Skip to content

Commit

Permalink
(maint) Constrain orchestrator_client to < 0.7.1 (#528)
Browse files Browse the repository at this point in the history
* (maint) Fix weird bundler resolution of Faraday in orchestrator client 0.7.1 by pinning to an old version until fixed

* Apply Yamlfix format changes.

* (maint) Bump ruby_task_helper to version 1.0.0 to fix CI error and support puppet 8

---------

Co-authored-by: jhbuchanan45 <[email protected]>
  • Loading branch information
jhbuchanan45 and jhbuchanan45 authored Nov 26, 2024
1 parent 391b83d commit 5d12b3a
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 23 deletions.
51 changes: 29 additions & 22 deletions .sync.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,43 @@
---
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
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:
Expand All @@ -41,7 +48,7 @@ spec/spec_helper.rb:
unmanaged: false
.travis.yml:
delete: true
".gitlab-ci.yml":
.gitlab-ci.yml:
delete: true
appveyor.yml:
delete: true
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
end
group :system_tests do
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down

0 comments on commit 5d12b3a

Please sign in to comment.