Skip to content

Commit ebfb108

Browse files
authored
Merge pull request #1986 from puppetlabs/pdksync_travis-updates
pdksync - (maint) travis updates: bundler and slack
2 parents 36501a6 + 55ae61e commit ebfb108

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
@@ -66,6 +66,9 @@
6666
branches:
6767
- release
6868
simplecov: true
69+
notifications:
70+
slack:
71+
secure: MrXQwGIUO7WNmLbe7iiWgURiZPUgyvDLkKe3d9S58ohE6gdN6pqlsjP8YgodK8JmIBV1zp5Wj/0cXUmY3xvCtnDmII0DCEk2Y1Cs/W1drKZtS/0BsUpJkj0rDP2fSlKsY5ifESdEta/y8+NkjRnqadbl7SQPYeek4IjAfxjjuig=
6972
appveyor.yml:
7073
delete: true
7174
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:
@@ -78,3 +80,5 @@ branches:
7880
- release
7981
notifications:
8082
email: false
83+
slack:
84+
secure: MrXQwGIUO7WNmLbe7iiWgURiZPUgyvDLkKe3d9S58ohE6gdN6pqlsjP8YgodK8JmIBV1zp5Wj/0cXUmY3xvCtnDmII0DCEk2Y1Cs/W1drKZtS/0BsUpJkj0rDP2fSlKsY5ifESdEta/y8+NkjRnqadbl7SQPYeek4IjAfxjjuig=

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
}
8383
],
8484
"description": "Module for Apache configuration",
85-
"pdk-version": "1.14.1",
85+
"pdk-version": "1.15.0",
8686
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
87-
"template-ref": "heads/master-0-g643529a"
87+
"template-ref": "heads/master-0-gcaed9d7"
8888
}

0 commit comments

Comments
 (0)