Skip to content

Commit

Permalink
(PDK-1501) Allow Appveyor CI config to be templated
Browse files Browse the repository at this point in the history
Previously the module unmanaged the Appveyor CI file when converted to Litmus.
This commit allows the Appveyor CI file to be managed.
  • Loading branch information
glennsarti committed Nov 7, 2019
1 parent 8a76656 commit 7c49de4
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 5 deletions.
13 changes: 12 additions & 1 deletion .sync.yml
@@ -1,6 +1,16 @@
---
appveyor.yml:
unmanaged: true
use_litmus: true
matrix_extras:
-
RUBY_VERSION: 25-x64
ACCEPTANCE: 'yes'
TARGET_HOST: localhost
-
RUBY_VERSION: 25-x64
ACCEPTANCE: 'yes'
TARGET_HOST: localhost
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017

.gitignore:
required:
Expand Down Expand Up @@ -82,6 +92,7 @@ appveyor.yml:
sudo: required

Gemfile:
use_litmus: true
required:
':development':
- gem: puppet-lint-i18n
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Expand Up @@ -25,9 +25,9 @@ group :development do
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))
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
gem "puppet-module-win-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet-lint-i18n", require: false
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')
end
Expand Down
10 changes: 8 additions & 2 deletions appveyor.yml
Expand Up @@ -53,8 +53,14 @@ for:
- bundle install --jobs 4 --retry 2
- type Gemfile.lock
test_script:
- bundle exec rake spec_prep
- bundle exec rake litmus:acceptance:localhost
- bundle exec puppet -V
- ruby -v
- gem -v
- bundle -v
- bundle exec rake spec_prep
- bundle exec rake litmus:acceptance:localhost
matrix:
fast_finish: true
install:
- set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
- bundle install --jobs 4 --retry 2 --without system_tests
Expand Down

0 comments on commit 7c49de4

Please sign in to comment.