Skip to content

Commit 0871e53

Browse files
Merge pull request #280 from sheenaajay/disableforge
(maint) disable forge upload
2 parents 74dc9fb + 1dae8f9 commit 0871e53

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

.sync.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
include_todos: true
66
selected_profile: false
77
".travis.yml":
8+
deploy_to_forge:
9+
enabled: false
810
simplecov: true
911
before_install_pre:
1012
- bash <(curl -s https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.sh) -skip-sudo-check

.travis.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ before_install:
1010
- rm -f Gemfile.lock
1111
- "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
1212
- "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used"
13-
- '[ -z "$RUBYGEMS_VERSION" ] || yes | gem update --system $RUBYGEMS_VERSION'
13+
- "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set"
14+
- '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION'
1415
- gem --version
1516
- bundle -v
1617
script:
@@ -22,9 +23,6 @@ stages:
2223
- static
2324
- spec
2425
- acceptance
25-
-
26-
if: tag =~ ^v\d
27-
name: deploy
2826
matrix:
2927
fast_finish: true
3028
include:
@@ -45,9 +43,6 @@ matrix:
4543
os: osx
4644
rvm: 2.5.3
4745
stage: acceptance
48-
-
49-
env: DEPLOY_TO_FORGE=yes
50-
stage: deploy
5146
branches:
5247
only:
5348
- master

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ group :development do
2424
gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2525
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2626
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
27-
gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
28-
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
29-
gem "puppet-module-win-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
30-
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
27+
gem "puppet-module-posix-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
28+
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
29+
gem "puppet-module-win-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
30+
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3131
gem "ruby-pwsh", require: false
3232
gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
3333
end

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,5 @@
7979
],
8080
"pdk-version": "1.15.0",
8181
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
82-
"template-ref": "heads/master-0-g73e79b9"
82+
"template-ref": "heads/master-0-g5676b3f"
8383
}

0 commit comments

Comments
 (0)