Skip to content

Commit bc60361

Browse files
sheenaajaysheenaajay
committed
(maint) pdk update
1 parent 88b6342 commit bc60361

File tree

6 files changed

+110
-53
lines changed

6 files changed

+110
-53
lines changed

‎.github/workflows/auto_release.yml

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
name: "Auto release"
2+
3+
on:
4+
schedule:
5+
- cron: '0 3 * * 6'
6+
workflow_dispatch:
7+
8+
env:
9+
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
10+
HONEYCOMB_DATASET: litmus tests
11+
CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
12+
13+
jobs:
14+
auto_release:
15+
name: "Automatic release prep"
16+
runs-on: ubuntu-20.04
17+
18+
steps:
19+
- name: "Honeycomb: Start recording"
20+
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
21+
with:
22+
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
23+
dataset: ${{ env.HONEYCOMB_DATASET }}
24+
job-status: ${{ job.status }}
25+
26+
- name: "Honeycomb: start first step"
27+
run: |
28+
echo STEP_ID="auto-release" >> $GITHUB_ENV
29+
echo STEP_START=$(date +%s) >> $GITHUB_ENV
30+
31+
- name: "Checkout Source"
32+
if: ${{ github.repository_owner == 'puppetlabs' }}
33+
uses: actions/checkout@v2
34+
with:
35+
fetch-depth: 0
36+
persist-credentials: false
37+
38+
- name: Append PDK to Gemfile
39+
if: ${{ github.repository_owner == 'puppetlabs' }}
40+
run: |
41+
echo "gem 'pdk'" >> Gemfile
42+
43+
- name: Activate Ruby 2.7
44+
uses: ruby/setup-ruby@v1
45+
if: ${{ github.repository_owner == 'puppetlabs' }}
46+
with:
47+
ruby-version: "2.7"
48+
bundler-cache: true
49+
50+
- name: Print bundle environment
51+
if: ${{ github.repository_owner == 'puppetlabs' }}
52+
run: |
53+
echo ::group::bundler environment
54+
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
55+
echo ::endgroup::
56+
57+
- name: "Honeycomb: Record Bundler Setup time"
58+
if: ${{ github.repository_owner == 'puppetlabs' }}
59+
run: |
60+
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Bundler Setup'
61+
echo STEP_ID="auto_release_setup" >> $GITHUB_ENV
62+
echo STEP_START=$(date +%s) >> $GITHUB_ENV
63+
64+
- name: "PDK Release prep"
65+
if: ${{ github.repository_owner == 'puppetlabs' }}
66+
run: |
67+
buildevents cmd $TRACE_ID $STEP_ID 'pdk release prep' -- bundle exec pdk release prep --force
68+
69+
- name: "Commit changes"
70+
if: ${{ github.repository_owner == 'puppetlabs' }}
71+
run: |
72+
git config --local user.email "action@github.com"
73+
git config --local user.name "GitHub Action"
74+
git add .
75+
git commit -m "Auto-Release prep"
76+
77+
- name: "Get Version"
78+
if: ${{ github.repository_owner == 'puppetlabs' }}
79+
id: gv
80+
run: |
81+
echo "::set-output name=ver::$(cat metadata.json | jq .version)"
82+
83+
- name: Create Pull Request
84+
id: cpr
85+
uses: puppetlabs/peter-evans-create-pull-request@v3
86+
if: ${{ github.repository_owner == 'puppetlabs' }}
87+
with:
88+
token: ${{ secrets.GITHUB_TOKEN }}
89+
commit-message: "Release prep v${{ steps.gv.outputs.ver }}"
90+
branch: "release-prep"
91+
delete-branch: true
92+
title: "Release prep v${{ steps.gv.outputs.ver }}"
93+
labels: "maintenance"
94+
95+
- name: PR outputs
96+
if: ${{ github.repository_owner == 'puppetlabs' }}
97+
run: |
98+
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
99+
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"

‎.rubocop.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ Style/BlockDelimiters:
3333
Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
3434
be consistent then.
3535
EnforcedStyle: braces_for_chaining
36-
Style/BracesAroundHashParameters:
37-
Description: Braces are required by Ruby 2.7. Cop removed from RuboCop v0.80.0.
38-
See https://github.com/rubocop-hq/rubocop/pull/7643
39-
Enabled: false
4036
Style/ClassAndModuleChildren:
4137
Description: Compact style reduces the required amount of indentation.
4238
EnforcedStyle: compact

‎.sync.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,11 @@ Rakefile:
4242
spec/spec_helper.rb:
4343
mock_with: ":rspec"
4444
coverage_report: true
45-
<<<<<<< HEAD
4645
.github/workflows/nightly.yml:
4746
unmanaged: false
4847
.github/workflows/pr_test.yml:
49-
=======
48+
unmanaged: false
5049
.gitpod.Dockerfile:
5150
unmanaged: false
5251
.gitpod.yml:
53-
>>>>>>> c228e75... Update pdk-templates for gitpod and codespaces support
5452
unmanaged: false

‎.travis.yml

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -72,34 +72,6 @@ jobs:
7272
services: docker
7373
stage: acceptance
7474
- before_script:
75-
<<<<<<< HEAD
76-
=======
77-
- "bundle exec rake 'litmus:provision_list[travis_el8]'"
78-
- "bundle exec rake 'litmus:install_agent[puppet5]'"
79-
- "bundle exec rake litmus:install_module"
80-
env:
81-
PLATFORMS: travis_el8_puppet5
82-
BUNDLE_WITH: system_tests
83-
rvm: 2.5.7
84-
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
85-
services: docker
86-
stage: acceptance
87-
<<<<<<< HEAD
88-
- before_script:
89-
=======
90-
-
91-
before_script:
92-
- "bundle exec rake 'litmus:provision_list[travis_el8]'"
93-
- "bundle exec rake 'litmus:install_agent[puppet5]'"
94-
- "bundle exec rake litmus:install_module"
95-
bundler_args:
96-
env: PLATFORMS=travis_el8_puppet5
97-
rvm: 2.5.7
98-
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
99-
services: docker
100-
stage: acceptance
101-
-
102-
before_script:
10375
- "bundle exec rake 'litmus:provision_list[travis_deb]'"
10476
- "bundle exec rake 'litmus:install_agent[puppet6]'"
10577
- "bundle exec rake litmus:install_module"
@@ -121,17 +93,6 @@ jobs:
12193
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
12294
services: docker
12395
stage: acceptance
124-
-
125-
before_script:
126-
- "bundle exec rake 'litmus:provision_list[travis_el8]'"
127-
- "bundle exec rake 'litmus:install_agent[puppet6]'"
128-
- "bundle exec rake litmus:install_module"
129-
bundler_args:
130-
env: PLATFORMS=travis_el8_puppet6
131-
rvm: 2.5.7
132-
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
133-
services: docker
134-
stage: acceptance
13596
-
13697
env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
13798
stage: static

‎Gemfile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,15 @@ group :development do
2020
gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2121
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2222
gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
23-
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
24-
gem "puppet-module-posix-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
25-
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
26-
gem "puppet-module-win-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
27-
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
28-
gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
23+
gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
24+
gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
25+
gem "puppet-module-win-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
26+
gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
27+
gem "github_changelog_generator", require: false
28+
end
29+
group :system_tests do
30+
gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
31+
gem "puppet-module-win-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
2932
end
3033

3134
puppet_version = ENV['PUPPET_GEM_VERSION']

‎metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,5 +89,5 @@
8989
],
9090
"pdk-version": "1.18.1",
9191
"template-url": "https://github.com/puppetlabs/pdk-templates#main",
92-
"template-ref": "heads/main-0-g874030e"
92+
"template-ref": "heads/main-0-gec9c129"
9393
}

0 commit comments

Comments
 (0)