Skip to content

Commit 32bb7aa

Browse files
authored
Merge pull request #1330 from puppetlabs/pdksync_pdksync_heads/main-0-gf3911d3
pdksync - pdksync_heads/main-0-gf3911d3
2 parents 628db71 + e764365 commit 32bb7aa

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

.github/workflows/nightly.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ env:
1111

1212
jobs:
1313
setup_matrix:
14+
if: ${{ github.repository_owner == 'puppetlabs' }}
1415
name: "Setup Test Matrix"
1516
runs-on: ubuntu-20.04
1617
outputs:
@@ -186,7 +187,7 @@ jobs:
186187
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Remove test environment'
187188
188189
slack-workflow-status:
189-
if: always()
190+
if: ${{ github.repository_owner == 'puppetlabs' }}
190191
name: Post Workflow Status To Slack
191192
needs:
192193
- Acceptance

.github/workflows/spec.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ jobs:
5454
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
5555
echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
5656
echo STEP_START=$(date +%s) >> $GITHUB_ENV
57-
- name: Run Static & Syntax Tests
58-
if: ${{ github.repository_owner == 'puppetlabs' }}
59-
run: |
60-
buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
57+
# - name: Run Static & Syntax Tests
58+
# if: ${{ github.repository_owner == 'puppetlabs' }}
59+
# run: |
60+
# buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
6161

6262
- name: Setup Spec Test Matrix
6363
id: get-matrix
@@ -120,6 +120,7 @@ jobs:
120120
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
121121
echo ::endgroup::
122122
123+
123124
- name: Run parallel_spec tests
124125
run: |
125126
buildevents cmd $TRACE_ID $STEP_ID 'rake parallel_spec Puppet ${{ matrix.puppet_version }}, Ruby ${{ matrix.ruby_version }}' -- bundle exec rake parallel_spec

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ require:
44
- rubocop-rspec
55
AllCops:
66
DisplayCopNames: true
7-
TargetRubyVersion: '2.4'
7+
TargetRubyVersion: '2.5'
88
Include:
99
- "**/*.rb"
1010
Exclude:

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ group :development do
2424
gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
2525
gem "puppet-module-win-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
2626
gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
27+
gem "voxpupuli-puppet-lint-plugins", '>= 3.0', require: false, platforms: [:ruby]
2728
gem "github_changelog_generator", require: false
2829
end
2930
group :system_tests do

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
"version_requirement": ">= 6.0.0 < 8.0.0"
9393
}
9494
],
95-
"pdk-version": "2.2.0",
95+
"pdk-version": "2.3.0",
9696
"template-url": "https://github.com/puppetlabs/pdk-templates#main",
97-
"template-ref": "2.3.0-0-g8aaceff"
97+
"template-ref": "heads/main-0-gf3911d3"
9898
}

0 commit comments

Comments
 (0)