Skip to content

Commit af0c778

Browse files
authored
Merge pull request #1123 from puppetlabs/pdksync_travis-updates
pdksync - (maint) travis updates: bundler and slack
2 parents 13656d3 + ab55661 commit af0c778

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

.sync.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,9 @@
141141
sudo: required
142142
stage: acceptance
143143
simplecov: true
144+
notifications:
145+
slack:
146+
secure: sulU0RHAFNMVQyQnqcyRHLRjL7Zl1Ao7ywuObL/qTsCiIweRsFiHX0BdTrurxobhjgdHQizx9G2IakkvhE120AOlLbCV9Nw45tvyuzdV4HhdPSKtwdWWKXgU4IvP2tSblZ4hCOEG4CuEKPvFtoY8UEW2ODmvvwFlQz+GOYOBYMw=
144147
appveyor.yml:
145148
delete: true
146149
Gemfile:

.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ cache: bundler
55
before_install:
66
- bundle -v
77
- rm -f Gemfile.lock
8-
- gem update --system $RUBYGEMS_VERSION
8+
- "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
9+
- "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used"
10+
- '[ -z "$RUBYGEMS_VERSION" ] || gem update --system $RUBYGEMS_VERSION'
911
- gem --version
1012
- bundle -v
1113
script:
@@ -138,6 +140,8 @@ branches:
138140
- release
139141
notifications:
140142
email: false
143+
slack:
144+
secure: sulU0RHAFNMVQyQnqcyRHLRjL7Zl1Ao7ywuObL/qTsCiIweRsFiHX0BdTrurxobhjgdHQizx9G2IakkvhE120AOlLbCV9Nw45tvyuzdV4HhdPSKtwdWWKXgU4IvP2tSblZ4hCOEG4CuEKPvFtoY8UEW2ODmvvwFlQz+GOYOBYMw=
141145
deploy:
142146
provider: puppetforge
143147
user: puppet

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"version_requirement": ">= 5.5.10 < 7.0.0"
8787
}
8888
],
89-
"pdk-version": "1.14.1",
89+
"pdk-version": "1.15.0",
9090
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
91-
"template-ref": "heads/master-0-g643529a"
91+
"template-ref": "heads/master-0-gcaed9d7"
9292
}

0 commit comments

Comments
 (0)