Skip to content

Commit 854f8ca

Browse files
committed
(MODULES-10945) Do not install PDK when running PR tests
Create a separate group in the Gemfile for pdk and puppet-blacksmith which are only used for releasing. In the workflow, avoid installing the release group.
1 parent 9b8399d commit 854f8ca

File tree

5 files changed

+8
-1
lines changed

5 files changed

+8
-1
lines changed

.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ jobs:
5252
run: |
5353
git config --global core.longpaths true
5454
bundle config set system 'true'
55+
bundle config set --local without 'release'
5556
${{ matrix.env_set_cmd }}PUPPET_GEM_VERSION=$(ruby -e 'puts /puppet\s+\((.+)\)/.match(`gem list -eld puppet`)[1]')
5657
bundle update --jobs 4 --retry 3
5758

.github/workflows/static_code_analysis.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
run: |
5555
git config --global core.longpaths true
5656
bundle config set system 'true'
57+
bundle config set --local without 'release'
5758
${{ matrix.env_set_cmd }}PUPPET_GEM_VERSION=$(ruby -e 'puts /puppet\s+\((.+)\)/.match(`gem list -eld puppet`)[1]')
5859
bundle update --jobs 4 --retry 3
5960

.github/workflows/unit_tests_with_released_puppet_gem.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,11 @@ group :system_tests do
4646
gem "beaker-hostgenerator"
4747
gem "beaker-rspec"
4848
gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 1.0')
49-
gem "pdk", '~> 1.18', platforms: [:ruby]
49+
end
50+
51+
group :release do
5052
gem "puppet-blacksmith", '~> 3.4', require: false
53+
gem "pdk", platforms: [:ruby]
5154
end
5255

5356
puppet_version = ENV['PUPPET_GEM_VERSION']

0 commit comments

Comments
 (0)