(MODULES-7023) Update .sync.yml for pdk update

This commit is contained in:
Helen Campbell
2018-04-26 15:04:48 +01:00
parent e1173e59c7
commit d7ab10786e
2 changed files with 9 additions and 32 deletions

View File

@@ -1,35 +1,13 @@
--- ---
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
- RUBY_VERSION: 24-x64
PUPPET_GEM_VERSION: "~> 5.0"
CHECK: spec
.travis.yml: .travis.yml:
env:
- PUPPET_GEM_VERSION="~> 5.0" CHECK=spec
bundle_args: --without system_tests
docker_sets: docker_sets:
- set: docker/centos-7 - set: docker/centos-7
options:
- set: docker/ubuntu-14.04 - set: docker/ubuntu-14.04
options:
docker_defaults: docker_defaults:
bundler_args: "" bundler_args: ""
secure: "" secure: ""
branches: branches:
- release - release
extras:
- rvm: 2.1.9
script: "\"bundle exec rake release_checks\""
Gemfile: Gemfile:
required: required:
@@ -52,10 +30,6 @@ Gemfile:
from_env: BEAKER_HOSTGENERATOR_VERSION from_env: BEAKER_HOSTGENERATOR_VERSION
- gem: beaker-rspec - gem: beaker-rspec
from_env: BEAKER_RSPEC_VERSION from_env: BEAKER_RSPEC_VERSION
':development':
- gem: puppet-blacksmith
version: '~> 3.4'
Rakefile: appveyor.yml:
requires: delete: true
- puppet_blacksmith/rake_tasks

View File

@@ -5,8 +5,9 @@ language: ruby
cache: bundler cache: bundler
before_install: before_install:
- bundle -v - bundle -v
- rm Gemfile.lock || true - rm -f Gemfile.lock
- gem update --system - gem update --system
- gem update bundler
- gem --version - gem --version
- bundle -v - bundle -v
script: script:
@@ -14,9 +15,7 @@ script:
bundler_args: --without system_tests bundler_args: --without system_tests
rvm: rvm:
- 2.4.1 - 2.4.1
- 2.1.9
env: env:
- PUPPET_GEM_VERSION="~> 4.0" CHECK=spec
- PUPPET_GEM_VERSION="~> 5.0" CHECK=spec - PUPPET_GEM_VERSION="~> 5.0" CHECK=spec
matrix: matrix:
fast_finish: true fast_finish: true
@@ -44,8 +43,12 @@ matrix:
- -
env: CHECK=metadata_lint env: CHECK=metadata_lint
- -
env: CHECK=release_checks
-
env: CHECK=spec
-
env: PUPPET_GEM_VERSION="~> 4.0" CHECK=spec
rvm: 2.1.9 rvm: 2.1.9
script: "bundle exec rake release_checks"
branches: branches:
only: only:
- master - master