Skip to content

Commit 0d72fe8

Browse files
authored
Merge pull request #70 from sooyean-hoo/69-ci-is-currently-not-working-looks-bad
69 ci is currently not working looks bad
2 parents 289fbb3 + 24320ba commit 0d72fe8

File tree

7 files changed

+38
-4
lines changed

7 files changed

+38
-4
lines changed

.github/workflows/ci.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: "CI"
2+
3+
on:
4+
push:
5+
branches:
6+
- "main"
7+
- "master"
8+
pull_request:
9+
branches:
10+
- "main"
11+
- "master"
12+
workflow_dispatch:
13+
14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.ref }}
16+
cancel-in-progress: true
17+
18+
jobs:
19+
Spec:
20+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
21+
secrets: "inherit"
22+
23+
# Not working as VMs all down.
24+
# Acceptance:
25+
# needs: Spec
26+
# uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
27+
# secrets: "inherit"
28+
# with:
29+
# flags: " --exclude-platforms '[\"CentOS-7\",\"CentOS-8\",\"OracleLinux-8\",\"RedHat-7\",\"RedHat-8\",\"Ubuntu-18.04\",\"OracleLinux-7\",\"Scientific-7\",\"SLES-12\"]'" # Only way for Acceptance CI to run in the absence of vmpooler's VMs
File renamed without changes.
File renamed without changes.

.puppet-lint.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
--relative
2+
--ignore-paths=spec/support/acceptance/control_repo/manifests/*

Gemfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ def location_for(place_or_version, fake_version = nil)
1414
end
1515

1616
ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
17-
minor_version = ruby_version_segments[0..1].join('.')
17+
#minor_version = ruby_version_segments[0..1].join('.')
18+
minor_version = '2.7' # Need to fix as this value, if left alone.. the above will have a version which will not get any rubygem
19+
1820

1921
group :development do
2022
gem "fast_gettext", '1.1.0', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
@@ -26,14 +28,15 @@ group :development do
2628
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
2729
# Temporarily setting puppet_litmus version to 0.26.0 or older because new litmus version changes where the inventory file gets
2830
# created/the name changes to litmus_inventory.yml which is not compatible with the current tests.
29-
gem "puppet_litmus", '~> 0.18', '<= 0.26.0', require: false, platforms: [:ruby]
31+
# gem "puppet_litmus", '~> 0.18', '<= 0.26.0', require: false, platforms: [:ruby]
32+
gem "puppet_litmus", '~> 0.36.0', '<= 0.36.1', require: false, platforms: [:ruby] # Has to upgrade to 0.36.0, else action will not work, as matrix_from_metadata_v2 will only give proper code at this version
3033
gem "puppet-module-posix-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
3134
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
3235
gem "puppet-module-win-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3336
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3437
gem "rspec_junit_formatter", require: false
3538
gem "hashdiff", require: false
36-
gem "pdk", require: false
39+
gem "pdk", '= 2.7.0', require: false
3740
end
3841

3942
puppet_version = ENV['PUPPET_GEM_VERSION']

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
{
1616
"name": "puppetlabs/inifile",
17-
"version_requirement": ">= 1.0.0 < 5.0.0"
17+
"version_requirement": ">= 1.0.0 < 6.3.0"
1818
},
1919
{
2020
"name": "puppetlabs/ruby_task_helper",

spec/support/acceptance/control_repo/manifests/site.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# no_param.pp
12
class no_param {}
23
class single_param(String $param = 'default') {}
34
class multiple_params(String $param_one = 'default', String $param_two = 'default') {}

0 commit comments

Comments
 (0)