Skip to content

Commit

Permalink
Disable deploy on master
Browse files Browse the repository at this point in the history
--skip-existing is broken at the moment

c.f. pypa/twine#332
  • Loading branch information
mayeut committed Apr 2, 2018
1 parent f2c7b7c commit 3f95de8
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 36 deletions.
28 changes: 14 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,20 @@ before_deploy:
- ls dist/

deploy:
# Deploy master non-tags to test PyPI
- provider: pypi
server: https://test.pypi.org/legacy/
user: mayeut
password:
secure: CUdAYN7ely3JCsSrM7cuSOcGgy0hEr2y0WzN1a6Gfc5VT2r/hiCp9+tlj2Ahuo4WKuz0TVJP65Zce8hg+4BZ6N0yDC1Cd8qjyBIPxo7Sjl4OubIepjfr3kftD8fxnoQ1R4Uv4ZKKULT70p7IBxZxS42YiGtCznmQdHJGcGG//Zfws0wZ1TMJzngFRMST0+MYDyGm88+raQavpxoDEs8gI2qBhV2gRr5w7axH8dY9IqRIGxnBJlT919hOOF8+hjT7skxrBCqgH9/Tq9TFcM9SA375tTEBsk6RCEujT0+7zjWvTKHcHL//4609lc3fYfQfpVlffvqU+HgvHjIpU03SB6izCKyfHNVwTOp7PfS4QhmKPbHTuIiId9iw2gaDU0OdY90pi16AoeiKnBQIaY+iR9xKyeSivm6UXM7NMqP53FPh1HEOuzBYj0cFe8suthu1pQltEq6XQC6v+0hhCLxVQAeltiqsz09zoaffBXWzfQRxN4FJBM2MWCQEdUJ8jVfrq+83uwf+u22g2GUYgjchcrTQF0u5uUlBcqpCKq5Jc8psALzWYhJ0pZPj6q8Kd3jkA5b9hmylkR69N+nTHwkSVh1zxg5JG3/Nd0pMypfq7OQn7HqflG6nA0vAgpdo6jT0STGRmsD9LisvqoktAbsMzVUAK1WFIZKAyq/d4Nx6nys=
distributions: clean_ext
skip_existing: true
skip_cleanup: true
on:
repo: mayeut/pybase64
tags: false
branch: master
condition: -z "${PYBASE64_TOX:-}${PYBASE64_VALGRIND:-}${PYBASE64_DOC:-}"
# # Deploy master non-tags to test PyPI
# - provider: pypi
# server: https://test.pypi.org/legacy/
# user: mayeut
# password:
# secure: CUdAYN7ely3JCsSrM7cuSOcGgy0hEr2y0WzN1a6Gfc5VT2r/hiCp9+tlj2Ahuo4WKuz0TVJP65Zce8hg+4BZ6N0yDC1Cd8qjyBIPxo7Sjl4OubIepjfr3kftD8fxnoQ1R4Uv4ZKKULT70p7IBxZxS42YiGtCznmQdHJGcGG//Zfws0wZ1TMJzngFRMST0+MYDyGm88+raQavpxoDEs8gI2qBhV2gRr5w7axH8dY9IqRIGxnBJlT919hOOF8+hjT7skxrBCqgH9/Tq9TFcM9SA375tTEBsk6RCEujT0+7zjWvTKHcHL//4609lc3fYfQfpVlffvqU+HgvHjIpU03SB6izCKyfHNVwTOp7PfS4QhmKPbHTuIiId9iw2gaDU0OdY90pi16AoeiKnBQIaY+iR9xKyeSivm6UXM7NMqP53FPh1HEOuzBYj0cFe8suthu1pQltEq6XQC6v+0hhCLxVQAeltiqsz09zoaffBXWzfQRxN4FJBM2MWCQEdUJ8jVfrq+83uwf+u22g2GUYgjchcrTQF0u5uUlBcqpCKq5Jc8psALzWYhJ0pZPj6q8Kd3jkA5b9hmylkR69N+nTHwkSVh1zxg5JG3/Nd0pMypfq7OQn7HqflG6nA0vAgpdo6jT0STGRmsD9LisvqoktAbsMzVUAK1WFIZKAyq/d4Nx6nys=
# distributions: clean_ext
# skip_existing: true
# skip_cleanup: true
# on:
# repo: mayeut/pybase64
# tags: false
# branch: master
# condition: -z "${PYBASE64_TOX:-}${PYBASE64_VALGRIND:-}${PYBASE64_DOC:-}"
# Deploy on tags to PyPI
- provider: pypi
user: mayeut
Expand Down
44 changes: 22 additions & 22 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,28 @@ artifacts:
name: Wheels

on_success:
# Deploy master non-tags to test PyPI
- ps: |
$deploy = $true
if (Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER) {
$deploy = $false
Write-Host "Skipping a deployment because the current build is a pull request." -ForegroundColor Yellow
}
else {
if($env:APPVEYOR_REPO_NAME -ne 'mayeut/pybase64') {
$deploy = $false
Write-Host "Skipping a deployment because this repo's name does not match 'mayeut/pybase64'." -ForegroundColor Yellow
}
if($env:APPVEYOR_REPO_BRANCH -ne 'master') {
$deploy = $false
Write-Host "Skipping a deployment because this branch is not permitted." -ForegroundColor Yellow
}
}
if($deploy) {
Write-Output ("Deploying master to Test PyPI...")
pip install --upgrade twine
twine upload -u $env:PYPI_USER -p $env:PYPI_TEST_PASSWD --repository-url https://test.pypi.org/legacy/ --skip-existing todeploy\*.whl
}
# # Deploy master non-tags to test PyPI
# - ps: |
# $deploy = $true
# if (Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER) {
# $deploy = $false
# Write-Host "Skipping a deployment because the current build is a pull request." -ForegroundColor Yellow
# }
# else {
# if($env:APPVEYOR_REPO_NAME -ne 'mayeut/pybase64') {
# $deploy = $false
# Write-Host "Skipping a deployment because this repo's name does not match 'mayeut/pybase64'." -ForegroundColor Yellow
# }
# if($env:APPVEYOR_REPO_BRANCH -ne 'master') {
# $deploy = $false
# Write-Host "Skipping a deployment because this branch is not permitted." -ForegroundColor Yellow
# }
# }
# if($deploy) {
# Write-Output ("Deploying master to Test PyPI...")
# pip install --upgrade twine
# twine upload -u $env:PYPI_USER -p $env:PYPI_TEST_PASSWD --repository-url https://test.pypi.org/legacy/ --skip-existing todeploy\*.whl
# }
# Deploy on tags to PyPI
- ps: |
$deploy = $true
Expand Down

0 comments on commit 3f95de8

Please sign in to comment.