Skip to content

Commit a7c7683

Browse files
committed
refactor: use deploy's master/address comments
1 parent e121389 commit a7c7683

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
# Trigger a new build of the deploy job of the deploy project
3636
- run:
3737
name: Trigger a deploy of the deploy project passing the desired environment/location to deploy to
38-
command: 'curl --header "Content-Type: application/json" --data "{\"build_parameters\": {\"deploy_location\": \"$CIRCLE_BRANCH\", \"CIRCLE_JOB\": \"deploy\"}}" --request POST "https://circleci.com/api/v1.1/project/github/PokeAPI/deploy/tree/test-staging?circle-token=$CIRCLECI_API_TOKEN"' # # TODO: replace `test-staging` with `master`
38+
command: 'curl --header "Content-Type: application/json" --data "{\"build_parameters\": {\"deploy_location\": \"$CIRCLE_BRANCH\", \"CIRCLE_JOB\": \"deploy\"}}" --request POST "https://circleci.com/api/v1.1/project/github/PokeAPI/deploy/tree/master?circle-token=$CIRCLECI_API_TOKEN"'
3939

4040
workflows:
4141
version: 2

updater/cmd.bash

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export COMPOSE_INTERACTIVE_NO_CLI=1
1616
dockerd --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 &> /dev/null &
1717

1818
git clone --depth=1 "$REPO_POKEAPI" pokeapi
19-
git clone "$REPO_DATA" api-data
19+
git clone --depth=1 "$REPO_DATA" api-data
2020

2121
# set up the pokeapi side
2222
cd pokeapi
@@ -30,10 +30,9 @@ docker-compose exec -T app sh -c 'echo "from data.v2.build import build_all; bui
3030

3131
# set up the data side
3232
cd ../api-data
33-
# git branch -D "$BRANCH_NAME" || true # TODO: uncomment
34-
# git branch "$BRANCH_NAME"
35-
# git checkout "$BRANCH_NAME"
36-
git checkout "$BRANCH_NAME" # TODO: remove
33+
git branch -D "$BRANCH_NAME" || true
34+
git branch "$BRANCH_NAME"
35+
git checkout "$BRANCH_NAME"
3736

3837
pip install -r requirements.txt
3938
rm -r ./data

0 commit comments

Comments
 (0)