Skip to content

Commit 7d5c681

Browse files
authored
Merge pull request #269 from puppetlabs/start_managing_ci
Start managing CI files
2 parents 32bab93 + 0d3a1aa commit 7d5c681

File tree

3 files changed

+42
-29
lines changed

3 files changed

+42
-29
lines changed

.sync.yml

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,44 @@
55
include_todos: true
66
selected_profile: false
77
".travis.yml":
8-
unmanaged: true
8+
simplecov: true
9+
before_install_pre:
10+
- bash <(curl -s https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.sh) -skip-sudo-check
11+
- 'pwsh -NoProfile -NoLogo -NonInteractive -Command \$PSVersionTable # Output the PowerShell Core version information'
12+
- if [ $BUNDLER_VERSION ]; then
13+
gem install -v $BUNDLER_VERSION bundler --no-rdoc --no-ri;
14+
fi
15+
includes:
16+
- os: osx
17+
comment: test Mac OSX edition of PowerShell Core on a single job
18+
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
19+
rvm: 2.5.3
20+
stage: acceptance
921
appveyor.yml:
10-
unmanaged: true
22+
simplecov: true
23+
install_post:
24+
- 'ps: "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest -Uri https://github.com/PowerShell/PowerShell/raw/master/tools/install-powershell.ps1 -UseBasicParsing -OutFile install-pwsh.ps1"'
25+
- 'ps: "& ./install-pwsh.ps1"'
26+
- set PATH=%LOCALAPPDATA%\Microsoft\powershell;%PATH%
27+
- pwsh -NoProfile -NoLogo -NonInteractive -Command $PSVersionTable
28+
- powershell -NoProfile -NoLogo -NonInteractive -Command $PSVersionTable
1129
Gemfile:
1230
optional:
1331
":development":
1432
- gem: ruby-pwsh
15-
required:
16-
':system_tests':
17-
- gem: 'puppet-module-posix-system-r#{minor_version}'
18-
platforms: ruby
19-
- gem: 'puppet-module-win-system-r#{minor_version}'
20-
platforms:
21-
- mswin
22-
- mingw
23-
- x64_mingw
24-
- gem: beaker-testmode_switcher
25-
version: '~> 0.4'
26-
- gem: master_manipulator
27-
- gem: puppet-blacksmith
33+
required:
34+
':system_tests':
35+
- gem: 'puppet-module-posix-system-r#{minor_version}'
36+
platforms: ruby
37+
- gem: 'puppet-module-win-system-r#{minor_version}'
38+
platforms:
39+
- mswin
40+
- mingw
41+
- x64_mingw
42+
- gem: beaker-testmode_switcher
43+
version: '~> 0.4'
44+
- gem: master_manipulator
45+
- gem: puppet-blacksmith
2846
version: '~> 3.4'
2947
spec/spec_helper.rb:
3048
coverage_report: true

.travis.yml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,11 @@
11
---
2-
os:
3-
- linux
4-
# OSX Only tests on the latest Puppet Gem, not the full matrix as there's no need to double up
5-
# testing effort here. We are only concerned about whether the Mac OSX edition of PowerShell Core
6-
# will work with our PowerShell manager code.
7-
- osx
8-
92
dist: xenial
103
language: ruby
114
cache: bundler
125
before_install:
13-
# Additional instructions
146
- bash <(curl -s https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.sh) -skip-sudo-check
15-
# Output the PowerShell Core version information
16-
- pwsh -NoProfile -NoLogo -NonInteractive -Command \$PSVersionTable
17-
- if [ $BUNDLER_VERSION ]; then
18-
gem install -v $BUNDLER_VERSION bundler --no-rdoc --no-ri;
19-
fi
7+
- pwsh -NoProfile -NoLogo -NonInteractive -Command \$PSVersionTable # Output the PowerShell Core version information
8+
- if [ $BUNDLER_VERSION ]; then gem install -v $BUNDLER_VERSION bundler --no-rdoc --no-ri; fi
209
- bundle -v
2110
- rm -f Gemfile.lock
2211
- gem update --system $RUBYGEMS_VERSION
@@ -48,6 +37,12 @@ matrix:
4837
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
4938
rvm: 2.5.3
5039
stage: spec
40+
-
41+
comment: test Mac OSX edition of PowerShell Core on a single job
42+
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
43+
os: osx
44+
rvm: 2.5.3
45+
stage: acceptance
5146
-
5247
env: DEPLOY_TO_FORGE=yes
5348
stage: deploy

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,5 @@
7979
],
8080
"pdk-version": "1.14.1",
8181
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
82-
"template-ref": "heads/master-0-gfaf9e8b"
82+
"template-ref": "heads/master-0-g643529a"
8383
}

0 commit comments

Comments
 (0)