Skip to content

Commit e53461c

Browse files
Merge pull request puppetlabs#208 from glennsarti/update-sync.yml
(maint) Update sync.yaml for new modsync config options
2 parents ee2bf81 + 8adfb72 commit e53461c

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

.sync.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,16 @@ Gemfile:
88
platforms: ["mswin", "mingw", "x64_mingw"]
99
version: '< 2.6.0'
1010
.travis.yml:
11-
unmanaged: true
11+
# Require sudo and Ubuntu 14 to install PowerShell
12+
sudo: required
13+
dist: trusty
14+
# Powershell installation instructions from
15+
# https://github.com/PowerShell/PowerShell/blob/master/docs/installation/linux.md#ubuntu-1404
16+
before_install:
17+
- curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
18+
- curl https://packages.microsoft.com/config/ubuntu/14.04/prod.list | sudo tee /etc/apt/sources.list.d/microsoft.list
19+
- sudo apt-get update
20+
- sudo apt-get install -y powershell
1221
spec/spec_helper.rb:
1322
unmanaged: true
1423
appveyor.yml:
@@ -21,6 +30,6 @@ NOTICE:
2130
copyright_holders:
2231
- name: 'Josh Cooper, original author'
2332
begin: 2013
33+
end: 2013
2434
- name: 'Puppet, Inc.'
2535
begin: 2013
26-
end: 'latest'

.travis.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
1+
#This file is generated by ModuleSync, do not edit.
12
---
2-
# Require sudo and Ubuntu 14 to install PowerShell
33
sudo: required
44
dist: trusty
55
language: ruby
66
cache: bundler
77
script: "bundle exec rake release_checks"
8-
#Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203
98
before_install:
10-
- gem update bundler
11-
# Powershell installation instructions from
12-
# https://github.com/PowerShell/PowerShell/blob/master/docs/installation/linux.md#ubuntu-1404
9+
# Additional instructions
1310
- curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
1411
- curl https://packages.microsoft.com/config/ubuntu/14.04/prod.list | sudo tee /etc/apt/sources.list.d/microsoft.list
1512
- sudo apt-get update
1613
- sudo apt-get install -y powershell
1714
matrix:
1815
fast_finish: true
1916
include:
20-
- rvm: 2.3.1
17+
- rvm: 2.4.1
2118
bundler_args: --without system_tests
22-
env: PUPPET_GEM_VERSION="~> 4.0"
23-
- rvm: 2.1.7
19+
env: PUPPET_GEM_VERSION="~> 5.0"
20+
- rvm: 2.1.9
2421
bundler_args: --without system_tests
2522
env: PUPPET_GEM_VERSION="~> 4.0"
2623
notifications:

NOTICE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Puppet Module - puppetlabs-powershell
22

3-
Copyright 2013 Josh Cooper, original author
4-
Copyright 2013 - 2017 Puppet, Inc.
3+
Copyright 2013 - 2013 Josh Cooper, original author
4+
Copyright 2013 Puppet, Inc.
55

66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)