Skip to content

Commit 15dc2f5

Browse files
authored
Merge pull request #274 from puppetlabs/pdksync_travis-updates
pdksync - (maint) travis updates: bundler and slack
2 parents 3de5345 + c4eb72e commit 15dc2f5

File tree

3 files changed

+35
-31
lines changed

3 files changed

+35
-31
lines changed

.sync.yml

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,28 @@
99
enabled: false
1010
simplecov: true
1111
before_install_pre:
12-
- bash <(curl -s https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.sh) -skip-sudo-check
13-
- 'pwsh -NoProfile -NoLogo -NonInteractive -Command \$PSVersionTable # Output the PowerShell Core version information'
14-
- if [ $BUNDLER_VERSION ]; then
15-
gem install -v $BUNDLER_VERSION bundler --no-rdoc --no-ri;
16-
fi
12+
- bash <(curl -s https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.sh) -skip-sudo-check
13+
- 'pwsh -NoProfile -NoLogo -NonInteractive -Command \$PSVersionTable # Output the PowerShell Core version information'
14+
- if [ $BUNDLER_VERSION ]; then gem install -v $BUNDLER_VERSION bundler --no-rdoc --no-ri; fi
1715
includes:
18-
- os: osx
19-
comment: test Mac OSX edition of PowerShell Core on a single job
20-
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
21-
rvm: 2.5.3
22-
stage: acceptance
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
21+
notifications:
22+
slack:
23+
secure: Yqv+S1Bwz19bor4xu3v7i5rLPzQuwTSZhO5wjsrX+jhKDN5/+e7e53x/v3Onjdrn9rjwFAxwzciAte0MO96xLFjyzWyUSziGur8/v3TcbRnnVQMOnIEj0HfmyLbx1cpxGK9V8MPsWQVAoHCklTtZIsRjMw0PcD8+aVKVF3NcBK4=
2324
appveyor.yml:
2425
simplecov: true
2526
install_post:
26-
- '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"'
27-
- 'ps: "& ./install-pwsh.ps1"'
28-
- set PATH=%LOCALAPPDATA%\Microsoft\powershell;%PATH%
29-
- pwsh -NoProfile -NoLogo -NonInteractive -Command $PSVersionTable
30-
- powershell -NoProfile -NoLogo -NonInteractive -Command $PSVersionTable
27+
- >-
28+
ps: "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest -Uri https://github.com/PowerShell/PowerShell/raw/master/tools/install-powershell.ps1 -UseBasicParsing
29+
-OutFile install-pwsh.ps1"
30+
- 'ps: "& ./install-pwsh.ps1"'
31+
- set PATH=%LOCALAPPDATA%\Microsoft\powershell;%PATH%
32+
- pwsh -NoProfile -NoLogo -NonInteractive -Command $PSVersionTable
33+
- powershell -NoProfile -NoLogo -NonInteractive -Command $PSVersionTable
3134
Gemfile:
3235
optional:
3336
":development":
@@ -37,18 +40,18 @@ Gemfile:
3740
ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
3841
condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
3942
required:
40-
':system_tests':
41-
- gem: 'puppet-module-posix-system-r#{minor_version}'
42-
platforms: ruby
43-
- gem: 'puppet-module-win-system-r#{minor_version}'
44-
platforms:
45-
- mswin
46-
- mingw
47-
- x64_mingw
48-
- gem: beaker-testmode_switcher
49-
version: '~> 0.4'
50-
- gem: master_manipulator
51-
- gem: puppet-blacksmith
52-
version: '~> 3.4'
43+
":system_tests":
44+
- gem: puppet-module-posix-system-r#{minor_version}
45+
platforms: ruby
46+
- gem: puppet-module-win-system-r#{minor_version}
47+
platforms:
48+
- mswin
49+
- mingw
50+
- x64_mingw
51+
- gem: beaker-testmode_switcher
52+
version: "~> 0.4"
53+
- gem: master_manipulator
54+
- gem: puppet-blacksmith
55+
version: "~> 3.4"
5356
spec/spec_helper.rb:
5457
coverage_report: true

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ before_install:
1010
- rm -f Gemfile.lock
1111
- "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
1212
- "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used"
13-
- "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set"
14-
- '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION'
13+
- '[ -z "$RUBYGEMS_VERSION" ] || gem update --system $RUBYGEMS_VERSION'
1514
- gem --version
1615
- bundle -v
1716
script:
@@ -49,3 +48,5 @@ branches:
4948
- /^v\d/
5049
notifications:
5150
email: false
51+
slack:
52+
secure: Yqv+S1Bwz19bor4xu3v7i5rLPzQuwTSZhO5wjsrX+jhKDN5/+e7e53x/v3Onjdrn9rjwFAxwzciAte0MO96xLFjyzWyUSziGur8/v3TcbRnnVQMOnIEj0HfmyLbx1cpxGK9V8MPsWQVAoHCklTtZIsRjMw0PcD8+aVKVF3NcBK4=

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.15.0",
8181
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
82-
"template-ref": "heads/master-0-g5676b3f"
82+
"template-ref": "heads/master-0-gcaed9d7"
8383
}

0 commit comments

Comments
 (0)