Skip to content

Commit 3394fd0

Browse files
committed
fix: update skell with every commit to master, so that it is not updated in release
1 parent 99f82be commit 3394fd0

File tree

1 file changed

+42
-18
lines changed

1 file changed

+42
-18
lines changed

.circleci/config.yml

Lines changed: 42 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010

1111
- restore_cache:
1212
keys:
13-
- deps-v5-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-{{ epoch }}
14-
- deps-v5-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-
13+
- deps-v5-{{ checksum "/tmp/src/templateflow/setup.cfg"}}-{{ epoch }}
14+
- deps-v5-{{ checksum "/tmp/src/templateflow/setup.cfg"}}-
1515
- deps-v5-
1616

1717
- run:
@@ -29,7 +29,7 @@ jobs:
2929
pyenv global 3.5.2
3030
virtualenv venv
3131
pip install -U pip
32-
pip install -r /tmp/src/templateflow/requirements.txt
32+
pip install -r /tmp/src/templateflow/setup.cfg
3333
pip install datalad
3434
pip install "setuptools>=27.0" twine codecov
3535
@@ -49,7 +49,7 @@ jobs:
4949
git config --global user.email "[email protected]"
5050
5151
- save_cache:
52-
key: deps-v5-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-{{ epoch }}
52+
key: deps-v5-{{ checksum "/tmp/src/templateflow/setup.cfg"}}-{{ epoch }}
5353
paths:
5454
- "/opt/circleci/.pyenv/versions/3.5.2"
5555
- "/tmp/data/templateflow"
@@ -177,7 +177,7 @@ jobs:
177177
paths:
178178
- resources
179179

180-
deploy_pypi:
180+
update_skel:
181181
machine:
182182
image: circleci/classic:201711-01
183183
working_directory: /tmp/src/templateflow
@@ -190,21 +190,10 @@ jobs:
190190

191191
- restore_cache:
192192
keys:
193-
- deps-v5-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-{{ epoch }}
194-
- deps-v5-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-
193+
- deps-v5-{{ checksum "/tmp/src/templateflow/setup.cfg"}}-{{ epoch }}
194+
- deps-v5-{{ checksum "/tmp/src/templateflow/setup.cfg"}}-
195195
- deps-v5-
196196

197-
- run:
198-
name: Deploy to PyPi
199-
command: |
200-
pyenv global 3.5.2
201-
virtualenv venv
202-
pip install "setuptools>=27.0" twine
203-
cp /tmp/resources/templateflow-skel.zip templateflow/conf/
204-
python setup.py sdist
205-
twine check dist/*
206-
twine upload dist/*
207-
208197
- add_ssh_keys:
209198
fingerprints:
210199
- "ae:95:0c:cc:09:84:64:99:92:82:b7:b5:f4:a7:e9:23"
@@ -221,6 +210,33 @@ jobs:
221210
git commit -m "rel(${CIRCLE_TAG}): Update S3 skeleton file [skip ci]"
222211
git push origin HEAD:master
223212
213+
deploy_pypi:
214+
machine:
215+
image: circleci/classic:201711-01
216+
working_directory: /tmp/src/templateflow
217+
steps:
218+
- attach_workspace:
219+
at: /tmp
220+
221+
- checkout:
222+
path: /tmp/src/templateflow
223+
224+
- restore_cache:
225+
keys:
226+
- deps-v5-{{ checksum "/tmp/src/templateflow/setup.cfg"}}-{{ epoch }}
227+
- deps-v5-{{ checksum "/tmp/src/templateflow/setup.cfg"}}-
228+
- deps-v5-
229+
230+
- run:
231+
name: Deploy to PyPi
232+
command: |
233+
pyenv global 3.5.2
234+
virtualenv venv
235+
pip install "setuptools>=27.0" twine
236+
python setup.py sdist
237+
twine check dist/*
238+
twine upload dist/*
239+
224240
workflows:
225241
version: 2
226242
build_test_deploy:
@@ -237,3 +253,11 @@ workflows:
237253
ignore: /.*/
238254
tags:
239255
only: /.*/
256+
- update_skel:
257+
requires:
258+
- tests
259+
filters:
260+
branches:
261+
only: /master/
262+
tags:
263+
ignore: /.*/

0 commit comments

Comments
 (0)