Skip to content

Commit 66867e9

Browse files
authored
Fix cronjob CI channel detection (#5051)
This fixes cronjob CI. Duckscript is weird about `or`. We should report this upstream.
1 parent 6230a49 commit 66867e9

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.github/workflows/build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727
- nightly
2828
schedule:
2929
# Run nightly cronjob CI every day at 14 UTC / 6AM PST / 3PM CET
30-
- cron: '0 * * * *'
30+
- cron: '15 * * * *'
3131
# Run beta slightly later
3232
- cron: '1 * * * *'
3333

Makefile.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,12 +294,14 @@ ci_toolchain = set "pinned-stable"
294294
echo "set-ci-toolchain: GITHUB_EVENT_NAME is ${event_name}"
295295
296296
# We need to parse the channel information for dispatch/schedule events
297-
if eq "${event_name}" "workflow_dispatch" or eq "${event_name}" "schedule"
297+
is_workflow = set eq "${event_name}" "workflow_dispatch"
298+
is_schedule = set eq "${event_name}" "schedule"
299+
if is_workflow or is_schedule
298300
event_path = get_env GITHUB_EVENT_PATH
299301
event_file = readfile ${event_path}
300302
event_json = json_parse ${event_file}
301303
# For dispatch events
302-
if eq "${event_name}" "workflow_dispatch"
304+
if is_workflow
303305
echo "set-ci-toolchain: manually selected channel is ${event_json.inputs.channel}"
304306
if not eq "${event_json.inputs.channel}" "pinned-stable"
305307
needs_override = set true

0 commit comments

Comments
 (0)