Skip to content

Commit 5d12b3a

Browse files
authored
(maint) Constrain orchestrator_client to < 0.7.1 (#528)
* (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]>
1 parent 391b83d commit 5d12b3a

File tree

3 files changed

+31
-23
lines changed

3 files changed

+31
-23
lines changed

.sync.yml

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,43 @@
11
---
22
Gemfile:
33
required:
4-
':development':
5-
- gem: 'bolt'
4+
:development:
5+
- gem: bolt
66
version: '>= 3.10.0'
77
optional:
8-
':development':
9-
- gem: 'github_changelog_generator'
10-
version: '1.16.4' # Pinned to latest bug fix version
11-
- gem: 'octokit'
12-
version: '4.21.0' # Locked due to https://github.com/octokit/octokit.rb/issues/1391
8+
:development:
9+
- gem: github_changelog_generator
10+
version: 1.16.4 # Pinned to latest bug fix version
11+
- gem: octokit
12+
version: 4.21.0 # Locked due to https://github.com/octokit/octokit.rb/issues/1391
13+
# The Faraday requirements in orchestrator_client 0.7.1 causes Bundler to
14+
# resolve the dependency in unexpected ways and causes issues in CI
15+
- gem: orchestrator_client
16+
version: < 0.7.1
1317
Rakefile:
14-
changelog_since_tag: '2.5.0'
15-
default_disabled_lint_checks: ['strict_indent','manifest_whitespace_missing_newline_end_of_file']
18+
changelog_since_tag: 2.5.0
19+
default_disabled_lint_checks:
20+
- strict_indent
21+
- manifest_whitespace_missing_newline_end_of_file
1622
extras:
17-
- 'PuppetSyntax.exclude_paths = ["plans/**/*.pp", "spec/acceptance/**/plans/**/*.pp", "vendor/**/*"]'
23+
- PuppetSyntax.exclude_paths = ["plans/**/*.pp", "spec/acceptance/**/plans/**/*.pp",
24+
"vendor/**/*"]
1825
spec/spec_helper.rb:
19-
mock_with: ':rspec'
26+
mock_with: :rspec
2027
.gitignore:
2128
paths:
22-
- '.rerun.json'
29+
- .rerun.json
2330
- '*.tar.gz'
24-
- '.modules/'
25-
- '.plan_cache.json'
26-
- '.resource_types/'
27-
- 'bolt-debug.log'
28-
- 'spec/docker/**/*.tar.gz'
29-
- 'spec/docker/**/*.asc'
30-
- 'spec/docker/**/files/puppet-enterprise*'
31-
- 'spec/docker/.task_cache.json'
31+
- .modules/
32+
- .plan_cache.json
33+
- .resource_types/
34+
- bolt-debug.log
35+
- spec/docker/**/*.tar.gz
36+
- spec/docker/**/*.asc
37+
- spec/docker/**/files/puppet-enterprise*
38+
- spec/docker/.task_cache.json
3239
.github/workflows/auto_release.yml:
33-
unmanaged: false
40+
unmanaged: false
3441
.github/workflows/release.yml:
3542
unmanaged: false
3643
.github/workflows/spec.yml:
@@ -41,7 +48,7 @@ spec/spec_helper.rb:
4148
unmanaged: false
4249
.travis.yml:
4350
delete: true
44-
".gitlab-ci.yml":
51+
.gitlab-ci.yml:
4552
delete: true
4653
appveyor.yml:
4754
delete: true

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ group :development do
3838
gem "bolt", '>= 3.27.2', require: false
3939
gem "github_changelog_generator", '1.16.4', require: false
4040
gem "octokit", '4.21.0', require: false
41+
gem "orchestrator_client", '< 0.7.1', require: false
4142
end
4243
group :system_tests do
4344
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
},
3535
{
3636
"name": "puppetlabs/ruby_task_helper",
37-
"version_requirement": ">= 0.6.1 < 1.0.0"
37+
"version_requirement": ">= 1.0.0 < 2.0.0"
3838
}
3939
],
4040
"operatingsystem_support": [

0 commit comments

Comments
 (0)