Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 4 additions & 21 deletions .sync.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,14 @@
---
appveyor.yml:
environment:
PUPPET_GEM_VERSION: "~> 4.0"
matrix:
- RUBY_VERSION: 24-x64
CHECK: "syntax lint"
- RUBY_VERSION: 24-x64
CHECK: metadata_lint
- RUBY_VERSION: 24-x64
CHECK: rubocop

.travis.yml:
bundle_args: --without system_tests
docker_sets:
- set: docker/centos-7
options:
- set: docker/ubuntu-14.04
options:
docker_defaults:
bundler_args: ""
secure: ""
branches:
- release
extras:
- rvm: 2.1.9
script: "\"bundle exec rake release_checks\""


Gemfile:
required:
':system_tests':
Expand All @@ -48,13 +31,13 @@ Gemfile:
- gem: beaker-rspec
from_env: BEAKER_RSPEC_VERSION
':development':
- gem: puppet-blacksmith
version: '~> 3.4'
- gem: puppet-lint-i18n

appveyor.yml:
delete: true

Rakefile:
requires:
- puppet_blacksmith/rake_tasks
- puppet_pot_generator/rake_tasks

spec/spec_helper.rb:
Expand Down
11 changes: 7 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,17 @@ language: ruby
cache: bundler
before_install:
- bundle -v
- rm Gemfile.lock || true
- rm -f Gemfile.lock
- gem update --system
- gem update bundler
- gem --version
- bundle -v
script:
- 'bundle exec rake $CHECK'
bundler_args: --without system_tests
rvm:
- 2.4.1
- 2.1.9
env:
- PUPPET_GEM_VERSION="~> 4.0" CHECK=spec
- PUPPET_GEM_VERSION="~> 5.0" CHECK=spec
matrix:
fast_finish: true
Expand Down Expand Up @@ -44,8 +43,12 @@ matrix:
-
env: CHECK=metadata_lint
-
env: CHECK=release_checks
-
env: CHECK=spec
-
env: PUPPET_GEM_VERSION="~> 4.0" CHECK=spec
rvm: 2.1.9
script: "bundle exec rake release_checks"
branches:
only:
- master
Expand Down