Merge pull request #403 from puppetlabs/pdksync_pdksync-disableforge

pdksync - "MODULES-10236 disable deploy_to_forge for the module"
This commit is contained in:
david22swan
2019-12-09 15:59:33 +00:00
committed by GitHub
3 changed files with 3 additions and 7 deletions

View File

@@ -2,6 +2,8 @@
".gitlab-ci.yml": ".gitlab-ci.yml":
delete: true delete: true
".travis.yml": ".travis.yml":
deploy_to_forge:
enabled: false
branches: branches:
- release - release
includes: includes:

View File

@@ -17,9 +17,6 @@ stages:
- static - static
- spec - spec
- acceptance - acceptance
-
if: tag =~ ^v\d
name: deploy
matrix: matrix:
fast_finish: true fast_finish: true
include: include:
@@ -72,9 +69,6 @@ matrix:
services: docker services: docker
stage: acceptance stage: acceptance
sudo: required sudo: required
-
env: DEPLOY_TO_FORGE=yes
stage: deploy
branches: branches:
only: only:
- master - master

View File

@@ -81,6 +81,6 @@
} }
], ],
"template-url": "https://github.com/puppetlabs/pdk-templates#master", "template-url": "https://github.com/puppetlabs/pdk-templates#master",
"template-ref": "heads/master-0-gfaf9e8b", "template-ref": "heads/master-0-g643529a",
"pdk-version": "1.14.1" "pdk-version": "1.14.1"
} }