Skip to content

Commit 461b81d

Browse files
committed
(maint) Fix sync.yml and remove it from yamlfixer to fix a pdk update error
1 parent 66567dc commit 461b81d

File tree

2 files changed

+25
-27
lines changed

2 files changed

+25
-27
lines changed

.github/workflows/yamlformatter.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ jobs:
2222
id: changed_yaml_files
2323
run: |
2424
echo ${{ steps.get_file_changes.outputs.files }} | xargs -n 1 | grep -E "\.yml$|\.yaml$" > changed_files.txt
25-
# Remove dependabot.yml if it exists in the list
26-
sed -i '/.github\/dependabot.yml/d' changed_files.txt || true
25+
# Remove dependabot.yml and sync.yml if they exist in the list
26+
sed -i '/.github\/dependabot.yml/d' changed_files.txt || true
27+
sed -i '/.sync.yml/d' changed_files.txt || true
2728
yaml_files=$(cat changed_files.txt | tr '\n' ' ')
2829
rm changed_files.txt
2930
echo "files=${yaml_files}" >> $GITHUB_OUTPUT

.sync.yml

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,40 @@
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
1313
# The Faraday requirements in orchestrator_client 0.7.1 causes Bundler to
1414
# resolve the dependency in unexpected ways and causes issues in CI
1515
- gem: orchestrator_client
1616
version: < 0.7.1
1717
Rakefile:
18-
changelog_since_tag: 2.5.0
19-
default_disabled_lint_checks:
20-
- strict_indent
21-
- manifest_whitespace_missing_newline_end_of_file
18+
changelog_since_tag: '2.5.0'
19+
default_disabled_lint_checks: ['strict_indent','manifest_whitespace_missing_newline_end_of_file']
2220
extras:
23-
- PuppetSyntax.exclude_paths = ["plans/**/*.pp", "spec/acceptance/**/plans/**/*.pp",
24-
"vendor/**/*"]
21+
- 'PuppetSyntax.exclude_paths = ["plans/**/*.pp", "spec/acceptance/**/plans/**/*.pp", "vendor/**/*"]'
2522
spec/spec_helper.rb:
26-
mock_with: :rspec
23+
mock_with: ':rspec'
2724
.gitignore:
2825
paths:
29-
- .rerun.json
26+
- '.rerun.json'
3027
- '*.tar.gz'
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
28+
- '.modules/'
29+
- '.plan_cache.json'
30+
- '.resource_types/'
31+
- 'bolt-debug.log'
32+
- 'spec/docker/**/*.tar.gz'
33+
- 'spec/docker/**/*.asc'
34+
- 'spec/docker/**/files/puppet-enterprise*'
35+
- 'spec/docker/.task_cache.json'
3936
.github/workflows/auto_release.yml:
40-
unmanaged: false
37+
unmanaged: false
4138
.github/workflows/release.yml:
4239
unmanaged: false
4340
.github/workflows/spec.yml:
@@ -48,7 +45,7 @@ spec/spec_helper.rb:
4845
unmanaged: false
4946
.travis.yml:
5047
delete: true
51-
.gitlab-ci.yml:
48+
".gitlab-ci.yml":
5249
delete: true
5350
appveyor.yml:
5451
delete: true

0 commit comments

Comments
 (0)