Skip to content

Commit

Permalink
Merge #107
Browse files Browse the repository at this point in the history
107: CI: Use cortex-a72 r=jounathaen a=mkroening

Closes #99.

Co-authored-by: Martin Kröning <mkroening@posteo.net>
  • Loading branch information
bors[bot] and mkroening authored Jun 7, 2022
2 parents a7e041a + caa8f69 commit 2febafb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ jobs:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
arch: [x86_64, aarch64]
exclude:
# TODO: Workaround for https://github.com/hermitcore/rusty-loader/issues/99
- os: macos-latest
arch: aarch64
runs-on: ${{ matrix.os }}
steps:
- name: Install QEMU, NASM (ubuntu)
Expand Down Expand Up @@ -87,7 +83,7 @@ jobs:
if: matrix.arch == 'aarch64'
run: |
qemu-system-aarch64 \
-machine virt,gic-version=max -cpu max -smp 1 -m 512M \
-machine virt,gic-version=max -cpu cortex-a72 -smp 1 -m 512M \
-display none -serial stdio -semihosting \
-kernel target/aarch64/debug/rusty-loader
- name: Build (release)
Expand All @@ -108,7 +104,7 @@ jobs:
if: matrix.arch == 'aarch64'
run: |
qemu-system-aarch64 \
-machine virt,gic-version=max -cpu max -smp 1 -m 512M \
-machine virt,gic-version=max -cpu cortex-a72 -smp 1 -m 512M \
-display none -serial stdio -semihosting \
-kernel target/aarch64/release/rusty-loader
Expand Down
1 change: 1 addition & 0 deletions bors.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ status = [
"Integration Test (ubuntu-latest, x86_64)",
"Integration Test (ubuntu-latest, aarch64)",
"Integration Test (macos-latest, x86_64)",
"Integration Test (macos-latest, aarch64)",
"Integration Test (windows-latest, x86_64)",
"Integration Test (windows-latest, aarch64)",
]
Expand Down

0 comments on commit 2febafb

Please # to comment.