Skip to content

Commit 2c605fe

Browse files
author
Johnathan Van Why
committed
Merge branch 'master' into libtock2-crate
2 parents 67235fb + c59bb74 commit 2c605fe

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

.github/workflows/mac-os.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
name: ci-mac-os
44

5-
# We run this workflow during pull request review, but not for Bors merges, as
6-
# it takes over an hour to run.
5+
# We run this workflow during pull request review, but not for Bors merges. We
6+
# can change this if the workflow is reasonably quick and reliable.
77
on: pull_request
88

99
jobs:
@@ -14,14 +14,15 @@ jobs:
1414
# Clones a single commit from the libtock-rs repository. The commit cloned
1515
# is a merge commit between the PR's target branch and the PR's source.
1616
- name: Clone repository
17-
uses: actions/[email protected]
17+
uses: actions/checkout@v2
18+
19+
- name: Install arm-none-eabi-gcc
20+
uses: fiam/arm-none-eabi-gcc@v1
21+
with:
22+
release: '10-2020-q4'
1823

19-
# Install the toolchains we need, then run `cargo build`.
2024
- name: Build and Test
2125
run: |
22-
brew tap riscv/riscv
23-
brew update
24-
brew install riscv-gnu-toolchain --with-multilib
2526
cd "${GITHUB_WORKSPACE}"
26-
LIBTOCK_PLATFORM=hifive1 cargo build -p libtock_runtime \
27-
--target=riscv32imac-unknown-none-elf
27+
LIBTOCK_PLATFORM=nrf52 cargo build -p libtock_runtime \
28+
--target=thumbv7em-none-eabi

0 commit comments

Comments
 (0)