Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Start managing CI files #269

Merged
merged 4 commits into from
Dec 13, 2019
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
48 changes: 33 additions & 15 deletions .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
21 changes: 8 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CAn probably move this comment into .sync.yml

# 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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}