Skip to content

Commit 1542e2d

Browse files
authored
Merge pull request #1064 from glennsarti/manage-appveyor
(PDK-1501) Allow Appveyor CI config to be templated
2 parents dab8888 + 6ebc8a6 commit 1542e2d

File tree

4 files changed

+22
-7
lines changed

4 files changed

+22
-7
lines changed

.sync.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,20 @@
103103
stage: acceptance
104104

105105
appveyor.yml:
106-
unmanaged: true
106+
use_litmus: true
107+
matrix_extras:
108+
-
109+
RUBY_VERSION: 25-x64
110+
ACCEPTANCE: 'yes'
111+
TARGET_HOST: localhost
112+
-
113+
RUBY_VERSION: 25-x64
114+
ACCEPTANCE: 'yes'
115+
TARGET_HOST: localhost
116+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
107117

108118
Gemfile:
119+
use_litmus: true
109120
optional:
110121
':development':
111122
- gem: 'github_changelog_generator'

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ group :development do
2626
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2727
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
2828
gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
29-
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
29+
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
3030
gem "puppet-module-win-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
31-
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
31+
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3232
gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
3333
end
3434

appveyor.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,12 @@ for:
5353
- bundle install --jobs 4 --retry 2
5454
- type Gemfile.lock
5555
test_script:
56-
- bundle exec rake spec_prep
57-
- bundle exec rake litmus:acceptance:localhost
56+
- bundle exec puppet -V
57+
- ruby -v
58+
- gem -v
59+
- bundle -v
60+
- bundle exec rake spec_prep
61+
- bundle exec rake litmus:acceptance:localhost
5862
matrix:
5963
fast_finish: true
6064
install:

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
}
105105
],
106106
"description": "Standard Library for Puppet Modules",
107-
"pdk-version": "1.14.0",
107+
"pdk-version": "1.14.1",
108108
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
109-
"template-ref": "1.14.1-0-g0b5b39b"
109+
"template-ref": "heads/master-0-g1a92949"
110110
}

0 commit comments

Comments
 (0)