Skip to content

Commit c214e23

Browse files
authored
Merge pull request #27 from GabrielNagy/MODULES-10945/gemfile-updates
(MODULES-10945) Core module spring cleaning 2021
2 parents 0272b4f + 2d30e79 commit c214e23

File tree

5 files changed

+15
-10
lines changed

5 files changed

+15
-10
lines changed

.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ jobs:
1111
strategy:
1212
matrix:
1313
os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2016' ]
14-
puppet_version: [ 5, 6, 7 ]
14+
puppet_version: [ 6, 7 ]
1515
include:
16-
- puppet_version: 5
17-
ruby: 2.4
1816
- puppet_version: 6
1917
ruby: 2.5
2018
- puppet_version: 7
@@ -52,6 +50,7 @@ jobs:
5250
run: |
5351
git config --global core.longpaths true
5452
bundle config set system 'true'
53+
bundle config set --local without 'release'
5554
${{ matrix.env_set_cmd }}PUPPET_GEM_VERSION=$(ruby -e 'puts /puppet\s+\((.+)\)/.match(`gem list -eld puppet`)[1]')
5655
bundle update --jobs 4 --retry 3
5756

.github/workflows/static_code_analysis.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: Run checks
1313

1414
env:
15-
ruby_version: 2.5
15+
ruby_version: 2.6
1616
extra_checks: check:symlinks check:git_ignore check:dot_underscore check:test_file
1717

1818
runs-on: 'ubuntu-18.04'
@@ -30,6 +30,7 @@ jobs:
3030
- name: Prepare testing environment with bundler
3131
run: |
3232
git config --global core.longpaths true
33+
bundle config set --local without 'release'
3334
bundle update --jobs 4 --retry 3
3435
3536
- name: Run commits check

.github/workflows/unit_tests_with_nightly_puppet_gem.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@ jobs:
1313
strategy:
1414
matrix:
1515
os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2016' ]
16-
puppet_version: [ 5, 6, 7 ]
16+
puppet_version: [ 6, 7 ]
1717
include:
18-
- puppet_version: 5
19-
ruby: 2.4
2018
- puppet_version: 6
2119
ruby: 2.5
2220
- puppet_version: 7
@@ -54,6 +52,7 @@ jobs:
5452
run: |
5553
git config --global core.longpaths true
5654
bundle config set system 'true'
55+
bundle config set --local without 'release'
5756
${{ matrix.env_set_cmd }}PUPPET_GEM_VERSION=$(ruby -e 'puts /puppet\s+\((.+)\)/.match(`gem list -eld puppet`)[1]')
5857
bundle update --jobs 4 --retry 3
5958

.github/workflows/unit_tests_with_released_puppet_gem.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313
strategy:
1414
matrix:
1515
os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2016' ]
16-
puppet_version: [ 5, 6 ]
16+
puppet_version: [ 6, 7 ]
1717
include:
18-
- puppet_version: 5
19-
ruby: 2.4
2018
- puppet_version: 6
2119
ruby: 2.5
20+
- puppet_version: 7
21+
ruby: 2.7
2222

2323
- os: 'ubuntu-18.04'
2424
os_type: 'Linux'
@@ -43,6 +43,7 @@ jobs:
4343
run: |
4444
git config --global core.longpaths true
4545
bundle config set system 'true'
46+
bundle config set --local without 'release'
4647
bundle update --jobs 4 --retry 3
4748
4849
- name: Run unit tests

Gemfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ group :development do
3838
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')
3939
end
4040

41+
group :release do
42+
gem "puppet-blacksmith", '~> 3.4', require: false
43+
gem "pdk", platforms: [:ruby]
44+
end
45+
4146
puppet_version = ENV['PUPPET_GEM_VERSION']
4247
facter_version = ENV['FACTER_GEM_VERSION']
4348
hiera_version = ENV['HIERA_GEM_VERSION']

0 commit comments

Comments
 (0)