Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/python-test-deploy.yml
  • Loading branch information
Gscorreia89 committed Jan 14, 2021
1 parent 006a959 commit 492a308
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/python-test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
push:
branches: [ master, develop, "/^v\\d+\\.\\d+(\\.\\d+)?(-\\S*)?$/"]
tags:
- '*'
- "v*"
pull_request:
branches: [ master, develop ]

Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
python setup.py sdist bdist_wheel --dist-dir dist/
- name: Publish package
uses: pypa/gh-action-pypi-publish@master
if: startsWith(github.ref, 'refs/tags')
if: startsWith(github.ref, 'refs/tags/v')
with:
runs-on: ubuntu-latest
user: __token__
Expand Down

0 comments on commit 492a308

Please sign in to comment.