Skip to content

Commit 6e190e7

Browse files
author
CircleCI Bumpversion
committed
[DEV] Re-enabling all master workflow
1 parent dbe7563 commit 6e190e7

File tree

1 file changed

+35
-37
lines changed

1 file changed

+35
-37
lines changed

.circleci/config.yml

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
- "94:dc:75:8a:05:8e:b6:ef:bc:34:01:ed:7d:6b:86:ee"
6565
- when:
6666
condition:
67-
equal: [ circleci-project-setup, << pipeline.git.branch >> ]
67+
equal: [ master, << pipeline.git.branch >> ]
6868
steps:
6969
- run:
7070
name: Bumpversion
@@ -77,7 +77,7 @@ jobs:
7777
git add -u
7878
VERSION_NEW=$(cat setup.py| grep version | cut -c 20- | rev | cut -c 3- | rev)
7979
git commit -m "[DEPLOY] $VERSION_NEW [skip ci]"
80-
git push deploy HEAD:circleci-project-setup
80+
git push deploy HEAD:master
8181
8282
build-push-docker-images:
8383
parameters:
@@ -104,13 +104,13 @@ jobs:
104104
source $BASH_ENV
105105
- when:
106106
condition:
107-
equal: [ circleci-project-setup, << pipeline.git.branch >> ]
107+
equal: [ master, << pipeline.git.branch >> ]
108108
steps:
109109
- run:
110110
name: Push Docker image
111111
command: |
112112
source $BASH_ENV
113-
git pull origin circleci-project-setup
113+
git pull origin master
114114
VERSION_NEW=$(cat setup.py| grep version | cut -c 20- | rev | cut -c 3- | rev)
115115
docker login -u $DOCKER_USER -p $DOCKER_PASS
116116
docker pull << parameters.base-image>>:latest
@@ -130,12 +130,12 @@ jobs:
130130
- setup_remote_docker
131131
- when:
132132
condition:
133-
equal: [ circleci-project-setup, << pipeline.git.branch >> ]
133+
equal: [ master, << pipeline.git.branch >> ]
134134
steps:
135135
- run:
136136
name: Push to PyPi
137137
command: |
138-
git pull origin circleci-project-setup
138+
git pull origin master
139139
VERSION_NEW=$(cat setup.py| grep version | cut -c 20- | rev | cut -c 3- | rev)
140140
docker pull fentechai/cdt:$VERSION_NEW
141141
docker run -e PYPI_PASSWORD=$PYPI_PASSWORD --rm fentechai/cdt:$VERSION_NEW /bin/sh -c "cd /CDT && pip3 install --upgrade keyrings.alt && pip3 install twine wheel && python3 setup.py sdist bdist_wheel && twine upload -u divkal -p '$PYPI_PASSWORD' dist/*"
@@ -154,13 +154,13 @@ jobs:
154154
- "94:dc:75:8a:05:8e:b6:ef:bc:34:01:ed:7d:6b:86:ee"
155155
- when:
156156
condition:
157-
equal: [ circleci-project-setup, << pipeline.git.branch >> ]
157+
equal: [ master, << pipeline.git.branch >> ]
158158
steps:
159159
- run:
160160
name: Build Docs and Push to GitHub
161161
command: |
162162
cd /CDT
163-
git pull origin circleci-project-setup
163+
git pull origin master
164164
VERSION_NEW=$(cat setup.py| grep version | cut -c 20- | rev | cut -c 3- | rev)
165165
# docker pull fentechai/cdt:$VERSION_NEW
166166
git config --global user.email "[email protected]"
@@ -174,45 +174,43 @@ jobs:
174174
cd ..
175175
git add ./docs
176176
git commit -m "[DEPLOY] Docs $VERSION_NEW [skip ci]"
177-
git push deploy HEAD:circleci-project-setup
177+
git push deploy HEAD:master
178178
179179
180180
# Invoke jobs via workflows
181181
# See: https://circleci.com/docs/2.0/configuration-reference/#workflows
182182
workflows:
183183
default:
184184
jobs:
185-
# - build-test:
186-
# name: build-test-image
185+
- build-test:
186+
name: build-test-image
187187

188-
# - test-image:
189-
# name: test-image
190-
# requires: [build-test-image]
188+
- test-image:
189+
name: test-image
190+
requires: [build-test-image]
191191

192-
# - bumpversion:
193-
# requires: [test-image]
194-
# filters:
195-
# branches:
196-
# only:
197-
# - circleci-project-setup
192+
- bumpversion:
193+
requires: [test-image]
194+
filters:
195+
branches:
196+
only:
197+
- master
198198

199-
# - build-push-docker-images:
200-
# name: build-cpu-image
201-
# base-image: fentechai/cdt-base
202-
# target-image: fentechai/cdt
203-
# dockerfile: Dockerfile
204-
# requires: [bumpversion]
199+
- build-push-docker-images:
200+
name: build-cpu-image
201+
base-image: fentechai/cdt-base
202+
target-image: fentechai/cdt
203+
dockerfile: Dockerfile
204+
requires: [bumpversion]
205205

206-
# - build-push-docker-images:
207-
# name: build-gpu-image
208-
# base-image: fentechai/nv-cdt-base
209-
# target-image: fentechai/nv-cdt
210-
# dockerfile: nv-Dockerfile
211-
# requires: [bumpversion]
206+
- build-push-docker-images:
207+
name: build-gpu-image
208+
base-image: fentechai/nv-cdt-base
209+
target-image: fentechai/nv-cdt
210+
dockerfile: nv-Dockerfile
211+
requires: [bumpversion]
212212

213-
# - deploy-pypi:
214-
# name: deploy-Pypi
215-
# requires: [build-cpu-image]
213+
- deploy-pypi:
214+
requires: [build-cpu-image]
216215
- build-docs:
217-
name: deploy-docs
218-
# requires: [build-cpu-image]
216+
requires: [build-cpu-image]

0 commit comments

Comments
 (0)