Skip to content

Commit 1c734a3

Browse files
author
CircleCI Bumpversion
committed
[CICD] FIX
1 parent 8ad1b5d commit 1c734a3

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

.circleci/config.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
name: Push Docker image
111111
command: |
112112
source $BASH_ENV
113-
git pull
113+
git pull origin circleci-project-setup
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
@@ -136,7 +136,7 @@ jobs:
136136
name: Push to PyPi
137137
command: |
138138
source $BASH_ENV
139-
git pull
139+
git pull origin circleci-project-setup
140140
VERSION_NEW=$(cat setup.py| grep version | cut -c 20- | rev | cut -c 3- | rev)
141141
docker pull fentechai/cdt:$VERSION_NEW
142142
docker run -e 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/*'
@@ -160,7 +160,7 @@ jobs:
160160
- run:
161161
name: Push to PyPi
162162
command: |
163-
git pull
163+
git pull origin circleci-project-setup
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]"
@@ -185,26 +185,26 @@ workflows:
185185
# name: test-image
186186
# requires: [build-test-image]
187187

188-
- bumpversion:
189-
# requires: [test-image]
190-
filters:
191-
branches:
192-
only:
193-
- circleci-project-setup
188+
# - bumpversion:
189+
# requires: [test-image]
190+
# lters:
191+
# branches:
192+
# only:
193+
# - circleci-project-setup
194194

195-
- build-push-docker-images:
195+
- build-push-docker-images:
196196
name: build-cpu-image
197197
base-image: fentechai/cdt-base
198198
target-image: fentechai/cdt
199199
dockerfile: Dockerfile
200-
requires: [bumpversion]
200+
# requires: [bumpversion]
201201

202202
- build-push-docker-images:
203203
name: build-gpu-image
204204
base-image: fentechai/nv-cdt-base
205205
target-image: fentechai/nv-cdt
206206
dockerfile: nv-Dockerfile
207-
requires: [bumpversion]
207+
# requires: [bumpversion]
208208

209209
- deploy-pypi:
210210
requires: [build-cpu-image]

0 commit comments

Comments
 (0)