Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix release script to push version tags in correct format #101

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- restore_cache:
key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
- setup_remote_docker:
docker_layer_caching: true
docker_layer_caching: false
- run:
command: |
python3 -m venv venv
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
- restore_cache:
key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
- setup_remote_docker:
docker_layer_caching: true
docker_layer_caching: false
- run:
command: |
sudo pip install twine
Expand All @@ -65,7 +65,7 @@ jobs:
working_directory: ~/fdk-python
steps:
- setup_remote_docker:
docker_layer_caching: true
docker_layer_caching: false
- checkout
- run:
name: Python 3.6 build
Expand All @@ -84,7 +84,7 @@ jobs:
working_directory: ~/fdk-python
steps:
- setup_remote_docker:
docker_layer_caching: true
docker_layer_caching: false
- checkout
- run:
name: Python 3.7.1 build
Expand Down
9 changes: 4 additions & 5 deletions release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@ echo "New version: $new_version"

echo "VERSION = '${new_version}'" > fdk/version.py

tag="$new_version"
tag="v$new_version"
git add -u
git commit -m "FDK Python: $new_version release [skip ci]"
git tag -f -a $tag -m "version $new_version"
git push
git push origin $tag
git commit -m "FDK Python: v$new_version release [skip ci]"
git tag -f -a $tag -m "version v$new_version"
git push --tags origin master

PBR_VERSION=${new_version} python setup.py sdist bdist_wheel
twine upload -u ${FN_PYPI_USER} -p ${FN_PYPI_PSWD} dist/fdk-${new_version}*