Skip to content

Commit 217bfe5

Browse files
authored
Adding necessary git config vars to do commits from inside of the CI jobs (#93)
* adding git config for CI commits * Adding necessary CI git configuration for commits from inside of any job
1 parent d70f248 commit 217bfe5

3 files changed

Lines changed: 9 additions & 4 deletions

File tree

.circleci/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ jobs:
4949
command: |
5050
if [[ "${CIRCLE_BRANCH}" == "master" && -z "${CIRCLE_PR_REPONAME}" ]]; then
5151
printenv DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
52+
53+
git config --global user.email "ci@fnproject.com"
54+
git config --global user.name "CI"
55+
git branch --set-upstream-to=origin/${CIRCLE_BRANCH} ${CIRCLE_BRANCH}
56+
5257
./build-images.sh 3.6
5358
./build-images.sh 3.7.1
5459
./release.sh

fdk/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION = "0.1.6"
1+
VERSION = "0.1.7"

release.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ echo "New version: $new_version"
2222

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

25-
PBR_VERSION=${new_version} python setup.py sdist bdist_wheel
26-
twine upload -u ${FN_PYPI_USER} -p ${FN_PYPI_PSWD} dist/fdk-${new_version}*
27-
2825
tag="$new_version"
2926
git add -u
3027
git commit -m "FDK Python: $new_version release [skip ci]"
3128
git tag -f -a $tag -m "version $new_version"
3229
git push
3330
git push origin $tag
31+
32+
PBR_VERSION=${new_version} python setup.py sdist bdist_wheel
33+
twine upload -u ${FN_PYPI_USER} -p ${FN_PYPI_PSWD} dist/fdk-${new_version}*

0 commit comments

Comments
 (0)