Skip to content

Commit 7a902bf

Browse files
Make RosesLiveID a string rather than a number (#127)
1 parent 3a9b520 commit 7a902bf

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494

9595
- name: Upload logs
9696
if: ${{ failure() }}
97-
uses: actions/upload-artifact@v3
97+
uses: actions/upload-artifact@v4
9898
with:
9999
name: Server logs (Integration)
100100
path: |
@@ -163,14 +163,14 @@ jobs:
163163

164164
- name: Upload videos of failures
165165
if: ${{ failure() }}
166-
uses: actions/upload-artifact@v3
166+
uses: actions/upload-artifact@v4
167167
with:
168168
name: E2E test video
169169
path: ./nodecg/bundles/ystv-sports-graphics/cypress/videos
170170

171171
- name: Upload logs
172172
if: ${{ failure() }}
173-
uses: actions/upload-artifact@v3
173+
uses: actions/upload-artifact@v4
174174
with:
175175
name: Server logs (E2E)
176176
path: |

scores-src/src/client/pages/CreateEventModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ export function CreateEventModal() {
111111
independent
112112
/>
113113
<Field
114-
type="number"
114+
type="text"
115115
name="rosesLiveID"
116116
title="RosesLive ID"
117117
helper="Don't touch this unless you know what you're doing."

scores-src/src/client/pages/EditEventModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export function EditEventForm() {
7979
independent
8080
/>
8181
<Field
82-
type="number"
82+
type="text"
8383
name="rosesLiveID"
8484
title="RosesLive ID"
8585
helper="Don't touch this unless you know what you're doing."

scores-src/src/common/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export const EventMetaSchema: Yup.SchemaOf<EventMeta> = Yup.object().shape({
3232
.default(() => new Date().toISOString()),
3333
name: Yup.string().required(),
3434
notCovered: Yup.boolean().default(false),
35-
rosesLiveID: Yup.number().optional(),
35+
rosesLiveID: Yup.string().optional(),
3636
winner: Yup.mixed<"home" | "away">().oneOf(["home", "away"]).notRequired(),
3737
worthPoints: Yup.number().integer().required().min(0),
3838
homeTeam: TeamInfoSchema,

scripts/test-e2e.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ while test $# -gt 0; do
2121
done
2222

2323
# Start database
24-
docker-compose --project-directory "$SCRIPT_DIR/.." up -d couchbase redis
24+
docker compose --project-directory "$SCRIPT_DIR/.." up -d couchbase redis
2525
echo "Waiting for Couchbase Server to be ready..."
2626
curl -u Administrator:password --retry 30 --retry-delay 0 --retry-all-errors -so /dev/null http://localhost:8091/pools/default/buckets/sports-scores
2727

scripts/test-integration.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export NODE_ENV=test
55
SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
66

77
# Start database
8-
docker-compose --project-directory "$SCRIPT_DIR/.." up -d couchbase redis
8+
docker compose --project-directory "$SCRIPT_DIR/.." up -d couchbase redis
99
echo "Waiting for Couchbase Server to be ready..."
1010
curl -u Administrator:password --retry 30 --retry-delay 0 --retry-all-errors -so /dev/null http://localhost:8091/pools/default/buckets/sports-scores
1111

scripts/test-unit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export NODE_ENV=test
55
SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
66

77
# Start Redis
8-
docker-compose --project-directory "$SCRIPT_DIR/.." up -d redis
8+
docker compose --project-directory "$SCRIPT_DIR/.." up -d redis
99

1010
pushd "$SCRIPT_DIR/../scores-src" || exit 1
1111
yarn test

yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8064,9 +8064,9 @@ __metadata:
80648064
linkType: hard
80658065

80668066
"caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001317":
8067-
version: 1.0.30001442
8068-
resolution: "caniuse-lite@npm:1.0.30001442"
8069-
checksum: c1bff65bd4f53da2d288e7f55be40706ee0119b983eae5a9dcc884046990476891630aef72d708f7989f8f1964200c44e4c37ea40deecaa2fb4a480df23e6317
8067+
version: 1.0.30001715
8068+
resolution: "caniuse-lite@npm:1.0.30001715"
8069+
checksum: c8371dceca0177518e43de537c74a01e64428ea65250d597c13472cf8277ffbc800c9a729ff0e7d271c8445ae90976ba64a170232b4498aee9552d993287a4c4
80708070
languageName: node
80718071
linkType: hard
80728072

0 commit comments

Comments
 (0)