aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Nagy <gabriel.nagy@puppet.com>2021-02-18 15:53:50 +0200
committerGabriel Nagy <gabriel.nagy@puppet.com>2021-02-18 16:05:20 +0200
commitbe4b336878f31a41296d82154d00ce92fb887f2f (patch)
treebd48190d7d7a81c45eafb1e47422e6cab268310c
parent248a515ac8ed1604462110e1d42962d2cad1356c (diff)
downloadpuppet-augeas_core-be4b336878f31a41296d82154d00ce92fb887f2f.tar.gz
puppet-augeas_core-be4b336878f31a41296d82154d00ce92fb887f2f.tar.bz2
(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.
-rw-r--r--.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml1
-rw-r--r--.github/workflows/static_code_analysis.yaml1
-rw-r--r--.github/workflows/unit_tests_with_nightly_puppet_gem.yaml1
-rw-r--r--.github/workflows/unit_tests_with_released_puppet_gem.yaml1
-rw-r--r--Gemfile5
5 files changed, 8 insertions, 1 deletions
diff --git a/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml b/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml
index 5bd0f50..34c169d 100644
--- a/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml
+++ b/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml
@@ -52,6 +52,7 @@ jobs:
run: |
git config --global core.longpaths true
bundle config set system 'true'
+ bundle config set --local without 'release'
${{ matrix.env_set_cmd }}PUPPET_GEM_VERSION=$(ruby -e 'puts /puppet\s+\((.+)\)/.match(`gem list -eld puppet`)[1]')
bundle update --jobs 4 --retry 3
diff --git a/.github/workflows/static_code_analysis.yaml b/.github/workflows/static_code_analysis.yaml
index 0a1f427..89c2cd4 100644
--- a/.github/workflows/static_code_analysis.yaml
+++ b/.github/workflows/static_code_analysis.yaml
@@ -30,6 +30,7 @@ jobs:
- name: Prepare testing environment with bundler
run: |
git config --global core.longpaths true
+ bundle config set --local without 'release'
bundle update --jobs 4 --retry 3
- name: Run commits check
diff --git a/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml b/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml
index 0b1afc0..8fad5ef 100644
--- a/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml
+++ b/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml
@@ -54,6 +54,7 @@ jobs:
run: |
git config --global core.longpaths true
bundle config set system 'true'
+ bundle config set --local without 'release'
${{ matrix.env_set_cmd }}PUPPET_GEM_VERSION=$(ruby -e 'puts /puppet\s+\((.+)\)/.match(`gem list -eld puppet`)[1]')
bundle update --jobs 4 --retry 3
diff --git a/.github/workflows/unit_tests_with_released_puppet_gem.yaml b/.github/workflows/unit_tests_with_released_puppet_gem.yaml
index 11ddefe..61b7b4c 100644
--- a/.github/workflows/unit_tests_with_released_puppet_gem.yaml
+++ b/.github/workflows/unit_tests_with_released_puppet_gem.yaml
@@ -43,6 +43,7 @@ jobs:
run: |
git config --global core.longpaths true
bundle config set system 'true'
+ bundle config set --local without 'release'
bundle update --jobs 4 --retry 3
- name: Run unit tests
diff --git a/Gemfile b/Gemfile
index 4ba2d59..73c8054 100644
--- a/Gemfile
+++ b/Gemfile
@@ -47,8 +47,11 @@ group :system_tests do
gem "beaker-hostgenerator"
gem "beaker-rspec"
gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 1.0')
- gem "pdk", '~> 1.18', platforms: [:ruby]
+end
+
+group :release do
gem "puppet-blacksmith", '~> 3.4', require: false
+ gem "pdk", platforms: [:ruby]
end
puppet_version = ENV['PUPPET_GEM_VERSION']