Skip to content

Commit 822033a

Browse files
committed
Merge branch 'master' of github.com:thoughtworks/byor-voting-web-app
2 parents 730894e + dd55b2f commit 822033a

File tree

16 files changed

+29
-29
lines changed

16 files changed

+29
-29
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ workflows:
105105
untagged:
106106
jobs:
107107
- test:
108-
context: byor
108+
context: BYOR-VotingApp
109109
- release:
110-
context: byor
110+
context: BYOR-VotingApp
111111
requires:
112112
- test
113113
filters:
@@ -118,9 +118,9 @@ workflows:
118118
jobs:
119119
- test:
120120
<<: *only_tagged_versions
121-
context: byor
121+
context: BYOR-VotingApp
122122
- publish:
123123
<<: *only_tagged_versions
124-
context: byor
124+
context: BYOR-VotingApp
125125
requires:
126126
- test

.make/cd/deploy_aws.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ EOF
3333
/bin/bash .make/utils/execute-in-docker.sh \
3434
-d "run" \
3535
-c "/bin/bash -c \"${final_command}\"" \
36-
-s "byor-app" \
36+
-s "byor-voting-web-app" \
3737
-o "--rm"

.make/cd/semantic_release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ fi
99
/bin/bash .make/utils/execute-in-docker.sh \
1010
-d "run" \
1111
-c "npm run semantic-release" \
12-
-s "byor-app" \
12+
-s "byor-voting-web-app" \
1313
-o "--rm"

.make/ci/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ echo "Taget radar service: ${RADAR_SERVICE_URL}"
1010
BACKEND_SERVICE_URL="${BACKEND_SERVICE_URL}" RADAR_SERVICE_URL="${RADAR_SERVICE_URL}" /bin/bash .make/utils/execute-in-docker.sh \
1111
-d "run" \
1212
-c "npm run build" \
13-
-s "byor-app" \
13+
-s "byor-voting-web-app" \
1414
-o "--rm"

.make/ci/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ set -e;
33

44
/bin/bash .make/utils/execute-in-docker.sh \
55
-c "npm install" \
6-
-s "byor-app" \
7-
-o "--build --exit-code-from byor-app"
6+
-s "byor-voting-web-app" \
7+
-o "--build --exit-code-from byor-voting-web-app"

.make/ci/lint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ echo "About to execute: ${full_command}"
1515
/bin/bash .make/utils/execute-in-docker.sh \
1616
-d "run" \
1717
-c "${full_command}" \
18-
-s "byor-app" \
18+
-s "byor-voting-web-app" \
1919
-o "--rm"

.make/ci/tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ case "${test_script}" in
2020
test)
2121
/bin/bash .make/utils/execute-in-docker.sh \
2222
-c "${full_command}" \
23-
-s "byor-app" \
24-
-o "--exit-code-from byor-app";;
23+
-s "byor-voting-web-app" \
24+
-o "--exit-code-from byor-voting-web-app";;
2525
*)
2626
echo "ERROR: ${test_script} is not supported"
2727
exit 1;;

.make/development/execute_command.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ if [ -z "${command}" ]; then
1010
command="${input_command}"
1111
fi
1212

13-
echo "About to execute \"${command}\" in byor-app container"
13+
echo "About to execute \"${command}\" in byor-voting-web-app container"
1414
/bin/bash .make/utils/execute-in-docker.sh \
1515
-d "run" \
1616
-c "${command}" \
17-
-s "byor-app" \
17+
-s "byor-voting-web-app" \
1818
-o "--rm"

.make/development/start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ echo "Target radar service: ${RADAR_SERVICE_URL}"
99

1010
BACKEND_SERVICE_URL="${BACKEND_SERVICE_URL}" RADAR_SERVICE_URL="${RADAR_SERVICE_URL}" /bin/bash ./.make/utils/execute-in-docker.sh \
1111
-c "npm run start" \
12-
-o "--exit-code-from byor-app"
12+
-o "--exit-code-from byor-voting-web-app"

.talismanrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fileignoreconfig:
1717
checksum: 0ac91d9d13996d2f4ddbf714fb797389d6cb621282440cee481a5f850b08e95f
1818
ignore_detectors: []
1919
- filename: src/app/services/backend.service.spec.ts
20-
checksum: 11106c6ac0ca3a2a4948a61c8537a9d13a9b47e7f595d79055383db9cf0ceecf
20+
checksum: dcf98ba54329a81de976728ca53eb91cbf13ac54a659422bdf0571ef237acf31
2121
ignore_detectors: []
2222
- filename: docs/images/vote_process.gif
2323
checksum: c3a82314b7db3029e5dd9b4226bde884f472561112b4287b5193eeeab1a7cf75
@@ -32,5 +32,5 @@ fileignoreconfig:
3232
checksum: 9a353b823ee064904663633b97d6fe7122e05dc9150e1d049781b8d1d0f4bc69
3333
ignore_detectors: []
3434
- filename: .make/cd/deploy_aws.sh
35-
checksum: 909387524c726d40c9971b9a2550d783fd5308b356a8ee23eaf704ca6b0d98d3
35+
checksum: ef91d1d1d9ba8571fbc8fbaa0459635a0bbef8bec2a8a2e1c9c6b21ace5b833c
3636
ignore_detectors: []

0 commit comments

Comments
 (0)