diff --git a/.circleci/config.yml b/.circleci/config.yml index 9ba0daa..aa073aa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/release.sh b/release.sh index 60dc644..0ab8a04 100755 --- a/release.sh +++ b/release.sh @@ -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}*