Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ defaults:

jobs:
cargo-deny:
runs-on: ubuntu-latest
runs-on: ubuntu-26.04
strategy:
matrix:
checks:
Expand All @@ -31,7 +31,7 @@ jobs:

clippy:
name: Clippy
runs-on: ubuntu-latest
runs-on: ubuntu-26.04
steps:
- uses: actions/checkout@v6
- uses: taiki-e/install-action@v2
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:

format:
name: Format
runs-on: ubuntu-latest
runs-on: ubuntu-26.04
steps:
- uses: actions/checkout@v6
- uses: mkroening/rust-toolchain-toml@main
Expand All @@ -85,7 +85,7 @@ jobs:

lock-file:
name: Lock file
runs-on: ubuntu-latest
runs-on: ubuntu-26.04
steps:
- uses: actions/checkout@v6
- uses: mkroening/rust-toolchain-toml@main
Expand All @@ -94,7 +94,7 @@ jobs:

machete:
name: Machete
runs-on: ubuntu-latest
runs-on: ubuntu-26.04
steps:
- uses: actions/checkout@v6
- uses: mkroening/rust-toolchain-toml@main
Expand All @@ -105,22 +105,22 @@ jobs:

typos:
name: Typos
runs-on: ubuntu-latest
runs-on: ubuntu-26.04
steps:
- uses: actions/checkout@v6
- uses: crate-ci/typos@master

doc:
name: Doc
runs-on: ubuntu-latest
runs-on: ubuntu-26.04
steps:
- uses: actions/checkout@v6
- uses: mkroening/rust-toolchain-toml@main
- run: cargo xtask doc

build:
name: Build
runs-on: ubuntu-latest
runs-on: ubuntu-26.04
steps:
- uses: actions/checkout@v6
- uses: mkroening/rust-toolchain-toml@main
Expand All @@ -132,7 +132,7 @@ jobs:

test:
name: Test
runs-on: ubuntu-latest
runs-on: ubuntu-26.04
steps:
- uses: actions/checkout@v6
- name: Install QEMU
Expand All @@ -156,7 +156,7 @@ jobs:

run-hermit:
name: Run
runs-on: ${{ (matrix.arch == 'aarch64' || matrix.arch == 'aarch64_be') && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
runs-on: ${{ (matrix.arch == 'aarch64' || matrix.arch == 'aarch64_be') && 'ubuntu-26.04-arm' || 'ubuntu-26.04' }}
env:
HERMIT_CAREFUL: ${{ matrix.hermit-careful }}
defaults:
Expand All @@ -180,7 +180,7 @@ jobs:
- arch: aarch64_be
packages: qemu-system-arm ipxe-qemu
- arch: riscv64
packages: qemu-system-misc
packages: qemu-system-riscv
rs_flags: --features hermit/semihosting

steps:
Expand Down Expand Up @@ -292,13 +292,11 @@ jobs:
if: matrix.arch != 'x86_64'
- run: cargo xtask ci rs --arch ${{ matrix.arch }} --profile ${{ matrix.profile }} ${{ matrix.rs_flags }} --package httpd --features ci,hermit/dhcpv4,hermit/virtio-net qemu ${{ matrix.qemu_flags }} --devices virtio-net-pci
if: matrix.arch != 'riscv64'
# FIXME: this is broken on QEMU 8.2.2
# Enable this once CI reaches QEMU 8.2.3 or QEMU 9.0.0
# - run: cargo xtask ci rs --arch ${{ matrix.arch }} --profile ${{ matrix.profile }} ${{ matrix.rs_flags }} --package httpd --features ci,hermit/dhcpv4,hermit/virtio-net qemu ${{ matrix.qemu_flags }} --devices virtio-net-pci
# if: matrix.arch != 'riscv64'
# env:
# # The buffer is sized to be smaller than the packets received during DHCPv4 address acquisition and thus exercise the buffer merging code path.
# HERMIT_MRG_RXBUF_SIZE: 200
- run: cargo xtask ci rs --arch ${{ matrix.arch }} --profile ${{ matrix.profile }} ${{ matrix.rs_flags }} --package httpd --features ci,hermit/dhcpv4,hermit/virtio-net qemu ${{ matrix.qemu_flags }} --devices virtio-net-pci
if: matrix.arch != 'riscv64'
env:
# The buffer is sized to be smaller than the packets received during DHCPv4 address acquisition and thus exercise the buffer merging code path.
HERMIT_MRG_RXBUF_SIZE: 200
- run: cargo xtask ci rs --arch ${{ matrix.arch }} --profile ${{ matrix.profile }} ${{ matrix.rs_flags }} --package httpd --features ci,hermit/virtio-net qemu ${{ matrix.qemu_flags }} --sudo --devices virtio-net-pci --tap
if: matrix.arch != 'riscv64'
- run: cargo xtask ci rs --arch ${{ matrix.arch }} --profile ${{ matrix.profile }} ${{ matrix.rs_flags }} --package httpd --features ci,hermit/dhcpv4,hermit/virtio-net qemu ${{ matrix.qemu_flags }} --devices virtio-net-pci --no-default-virtio-features
Expand Down
8 changes: 4 additions & 4 deletions xtask/src/ci/rftrace.snap
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# TID FUNCTION
[ 1] | rftrace_example::f1() {
[ 1] | rftrace_example::f2() {
[ 1] | rftrace_example::f3()
# TID FUNCTION
[ 1] | rftrace_example::f1() {
[ 1] | rftrace_example::f2() {
[ 1] | rftrace_example::f3()
Loading