aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuchi <39198766+luchihoratiu@users.noreply.github.com>2021-02-18 17:03:34 +0200
committerGitHub <noreply@github.com>2021-02-18 17:03:34 +0200
commit5b1e7bda012d339e4fc830274569a52a9b71a8de (patch)
tree6c8e23137a54c4deb32b2719465c1885661ebe3f
parent248a515ac8ed1604462110e1d42962d2cad1356c (diff)
parent7560f1435b2dbf9d636677a34a06d3f511ce688d (diff)
downloadpuppet-augeas_core-5b1e7bda012d339e4fc830274569a52a9b71a8de.tar.gz
puppet-augeas_core-5b1e7bda012d339e4fc830274569a52a9b71a8de.tar.bz2
Merge pull request #36 from GabrielNagy/MODULES-10945/gemfile-updates
(MODULES-10945) Core module spring cleaning 2021
-rw-r--r--.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml5
-rw-r--r--.github/workflows/static_code_analysis.yaml3
-rw-r--r--.github/workflows/unit_tests_with_nightly_puppet_gem.yaml5
-rw-r--r--.github/workflows/unit_tests_with_released_puppet_gem.yaml7
-rw-r--r--Gemfile11
5 files changed, 17 insertions, 14 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..d027aa4 100644
--- a/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml
+++ b/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml
@@ -11,10 +11,8 @@ jobs:
strategy:
matrix:
os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2016' ]
- puppet_version: [ 5, 6, 7 ]
+ puppet_version: [ 6, 7 ]
include:
- - puppet_version: 5
- ruby: 2.4
- puppet_version: 6
ruby: 2.5
- puppet_version: 7
@@ -52,6 +50,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..9a132eb 100644
--- a/.github/workflows/static_code_analysis.yaml
+++ b/.github/workflows/static_code_analysis.yaml
@@ -12,7 +12,7 @@ jobs:
name: Run checks
env:
- ruby_version: 2.5
+ ruby_version: 2.6
extra_checks: check:symlinks check:git_ignore check:dot_underscore check:test_file
runs-on: 'ubuntu-18.04'
@@ -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..e2122bd 100644
--- a/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml
+++ b/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml
@@ -13,10 +13,8 @@ jobs:
strategy:
matrix:
os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2016' ]
- puppet_version: [ 5, 6, 7 ]
+ puppet_version: [ 6, 7 ]
include:
- - puppet_version: 5
- ruby: 2.4
- puppet_version: 6
ruby: 2.5
- puppet_version: 7
@@ -54,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/unit_tests_with_released_puppet_gem.yaml b/.github/workflows/unit_tests_with_released_puppet_gem.yaml
index 11ddefe..bd157f3 100644
--- a/.github/workflows/unit_tests_with_released_puppet_gem.yaml
+++ b/.github/workflows/unit_tests_with_released_puppet_gem.yaml
@@ -13,12 +13,12 @@ jobs:
strategy:
matrix:
os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2016' ]
- puppet_version: [ 5, 6 ]
+ puppet_version: [ 6, 7 ]
include:
- - puppet_version: 5
- ruby: 2.4
- puppet_version: 6
ruby: 2.5
+ - puppet_version: 7
+ ruby: 2.7
- os: 'ubuntu-18.04'
os_type: 'Linux'
@@ -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..5f131ee 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,18 +37,21 @@ group :development do
gem "puppet-strings", require: false
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')
end
+
group :system_tests do
- gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
- gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
- gem "puppet-blacksmith", '~> 3.4', require: false
+ gem "puppet-module-posix-system-r#{minor_version}", '~> 0.5', require: false, platforms: [:ruby]
+ gem "puppet-module-win-system-r#{minor_version}", '~> 0.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4')
gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.5')
gem "beaker-pe", require: false
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']