templateflow / python-client

A python client to query TemplateFlow via pyBIDS
https://templateflow.org/python-client/
Apache License 2.0
8 stars 12 forks source link

CI: Push detached head to master #18

Closed effigies closed 5 years ago

effigies commented 5 years ago
#!/bin/bash -eo pipefail
git config user.email "${GITHUB_EMAIL}"
git config user.name "CircleCI Deploy"
git add templateflow/conf/templateflow-skel.zip
git commit -m "rel(${CIRCLE_TAG}): Update S3 skeleton file [skip ci]"
git push origin master

[detached HEAD ce41662] rel(0.4.1rc2): Update S3 skeleton file [skip ci]
 1 file changed, 0 insertions(+), 0 deletions(-)
 rewrite templateflow/conf/templateflow-skel.zip (73%)
Warning: Permanently added the RSA host key for IP address '192.30.253.112' to the list of known hosts.

Total 0 (delta 0), reused 0 (delta 0)
To github.com:templateflow/python-client.git
   a0adcb7..0c0deb9  master -> master
oesteban commented 5 years ago

Didn't see this. Although most of the releases will be done off of master, I don't think this would fully improve the situation when releasing from a different branch. I'm testing that right now

effigies commented 5 years ago

I think our two approaches were equivalent.

oesteban commented 5 years ago

It is still merging the full branch into master when releasing from the branch

effigies commented 5 years ago

Right. Did yours not?

oesteban commented 5 years ago

Didn't check, assumed it wouldn't. Let me try again :(

effigies commented 5 years ago

In both cases, you're committing on top of the latest release, and pushing the new commit to master. It will try a fast-forward merge. If what you want is to check out master and not merge from the branch:

git fetch origin
git checkout origin/master
git add ...
git commit ...
git push origin HEAD:master