diff --git a/.sync.yml b/.sync.yml index 49f860a8..02f2bfdd 100644 --- a/.sync.yml +++ b/.sync.yml @@ -5,26 +5,44 @@ include_todos: true selected_profile: false ".travis.yml": - unmanaged: true + simplecov: true + before_install_pre: + - bash <(curl -s https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.sh) -skip-sudo-check + - 'pwsh -NoProfile -NoLogo -NonInteractive -Command \$PSVersionTable # Output the PowerShell Core version information' + - if [ $BUNDLER_VERSION ]; then + gem install -v $BUNDLER_VERSION bundler --no-rdoc --no-ri; + fi + includes: + - os: osx + comment: test Mac OSX edition of PowerShell Core on a single job + env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec + rvm: 2.5.3 + stage: acceptance appveyor.yml: - unmanaged: true + simplecov: true + install_post: + - 'ps: "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest -Uri https://github.com/PowerShell/PowerShell/raw/master/tools/install-powershell.ps1 -UseBasicParsing -OutFile install-pwsh.ps1"' + - 'ps: "& ./install-pwsh.ps1"' + - set PATH=%LOCALAPPDATA%\Microsoft\powershell;%PATH% + - pwsh -NoProfile -NoLogo -NonInteractive -Command $PSVersionTable + - powershell -NoProfile -NoLogo -NonInteractive -Command $PSVersionTable Gemfile: optional: ":development": - gem: ruby-pwsh - required: - ':system_tests': - - gem: 'puppet-module-posix-system-r#{minor_version}' - platforms: ruby - - gem: 'puppet-module-win-system-r#{minor_version}' - platforms: - - mswin - - mingw - - x64_mingw - - gem: beaker-testmode_switcher - version: '~> 0.4' - - gem: master_manipulator - - gem: puppet-blacksmith + required: + ':system_tests': + - gem: 'puppet-module-posix-system-r#{minor_version}' + platforms: ruby + - gem: 'puppet-module-win-system-r#{minor_version}' + platforms: + - mswin + - mingw + - x64_mingw + - gem: beaker-testmode_switcher + version: '~> 0.4' + - gem: master_manipulator + - gem: puppet-blacksmith version: '~> 3.4' spec/spec_helper.rb: coverage_report: true diff --git a/.travis.yml b/.travis.yml index 1150d515..172104c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,22 +1,11 @@ --- -os: - - linux - # OSX Only tests on the latest Puppet Gem, not the full matrix as there's no need to double up - # testing effort here. We are only concerned about whether the Mac OSX edition of PowerShell Core - # will work with our PowerShell manager code. - - osx - dist: xenial language: ruby cache: bundler before_install: - # Additional instructions - bash <(curl -s https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.sh) -skip-sudo-check - # Output the PowerShell Core version information - - pwsh -NoProfile -NoLogo -NonInteractive -Command \$PSVersionTable - - if [ $BUNDLER_VERSION ]; then - gem install -v $BUNDLER_VERSION bundler --no-rdoc --no-ri; - fi + - pwsh -NoProfile -NoLogo -NonInteractive -Command \$PSVersionTable # Output the PowerShell Core version information + - if [ $BUNDLER_VERSION ]; then gem install -v $BUNDLER_VERSION bundler --no-rdoc --no-ri; fi - bundle -v - rm -f Gemfile.lock - gem update --system $RUBYGEMS_VERSION @@ -48,6 +37,12 @@ matrix: env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec rvm: 2.5.3 stage: spec + - + comment: test Mac OSX edition of PowerShell Core on a single job + env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec + os: osx + rvm: 2.5.3 + stage: acceptance - env: DEPLOY_TO_FORGE=yes stage: deploy diff --git a/metadata.json b/metadata.json index e1c99c88..6878adaa 100644 --- a/metadata.json +++ b/metadata.json @@ -79,5 +79,5 @@ ], "pdk-version": "1.14.1", "template-url": "https://github.com/puppetlabs/pdk-templates#master", - "template-ref": "heads/master-0-gfaf9e8b" + "template-ref": "heads/master-0-g643529a" }