Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Manishearth committed Nov 22, 2022
1 parent 74fea6e commit 00d329e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -751,17 +751,16 @@ jobs:
- name: Check if we need to force-nightly
id: force_nightly
run: |
force_nightly_status=$(cargo make check-needs-force-nightly-ci)
echo "::set-output name=force_nightly_status::${force_nightly_status}"
echo "::set-output name=force_nightly_status::$(cargo make --loglevel error check-needs-force-nightly-ci)"
# Clippy job > Install and run clippy steps

# We don't expect to keep being clippy-clean on nightly Rust
- name: Install clippy
if: steps.force_nightly.outputs.force_nightly_status != 'true'
if: steps.force_nightly.outputs.force_nightly_status != 'yes'
run: rustup component add clippy

- uses: actions-rs/[email protected]
if: steps.force_nightly.outputs.force_nightly_status != 'true'
if: steps.force_nightly.outputs.force_nightly_status != 'yes'
with:
token: ${{ secrets.GITHUB_TOKEN }}
# keep args in sync with `clippy-all` in .cargo/config.toml
Expand Down
9 changes: 4 additions & 5 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ if not ${env_file}
end
needs_run = exec cargo make --loglevel error check-needs-force-nightly-ci
needs_run = trim ${needs_run.stdout}
if eq ${needs_run} "yes"
echo "Setting up CI environment for forced-nightly Rust build"
appendfile ${env_file} "ICU4X_NIGHTLY_TOOLCHAIN=nightly\n"
Expand All @@ -214,14 +214,13 @@ if not ${event_name}
exit 1
end
is_schedule = eq ${event_name} "schedule"
is_pr = eq ${event_name} "pull_request"
is_dispatch = eq ${event_name} "workflow_dispatch"
is_schedule = eq "${event_name}" "schedule"
is_pr = eq "${event_name}" "pull_request"
is_dispatch = eq "${event_name}" "workflow_dispatch"
dispatch_needs_nightly = set false
if is_dispatch
event_path = get_env GITHUB_EVENT_PATH
echo ${event_path}
event_file = readfile ${event_path}
event_json = json_parse ${event_file}
if ${event_json.inputs.nightly}
Expand Down

0 comments on commit 00d329e

Please sign in to comment.