Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: hermit-os/kernel
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3ecc0b509337ececa7c82548b78e4562fabf246f
Choose a base ref
..
head repository: hermit-os/kernel
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 68bc67b5903c425f6d188ec070dab4a9e59cfef8
Choose a head ref
Showing with 78 additions and 71 deletions.
  1. +78 −71 .github/workflows/ci.yml
149 changes: 78 additions & 71 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -41,6 +41,9 @@ jobs:
- uses: Swatinem/rust-cache@v2
with:
save-if: ${{ github.ref == 'refs/heads/main' }}
workspaces: |
.
hermit-builtins
- run: cargo xtask clippy

format:
@@ -76,6 +79,9 @@ jobs:
- uses: Swatinem/rust-cache@v2
with:
save-if: ${{ github.ref == 'refs/heads/main' }}
workspaces: |
.
hermit-builtins
- name: Build minimal kernel
run: |
cargo xtask build --arch x86_64 --no-default-features
@@ -94,6 +100,9 @@ jobs:
- uses: Swatinem/rust-cache@v2
with:
save-if: ${{ github.ref == 'refs/heads/main' }}
workspaces: |
.
hermit-builtins
- name: Unit tests
run: cargo test --lib
env:
@@ -108,12 +117,58 @@ jobs:
env:
RUSTFLAGS:

run-x86_64:
name: Run Hermit for Rust (x86_64)
run-hermit:
name: Run
runs-on: ubuntu-latest
defaults:
run:
working-directory: kernel
strategy:
matrix:
arch: [x86_64, aarch64]
package: [rusty_demo, httpd, testudp, hello_world]
netdev: [none, virtio-net-pci, rtl8139]
profile: [dev, release]
exclude:
# microvm (Firecracker) test does not run on aarch64
- package: hello_world
arch: aarch64
# rtl8139 support does not build on aarch64
- arch: aarch64
netdev: rtl8139
# Following packages do not depend on the netdev
- package: rusty_demo
netdev: virtio-net-pci
- package: rusty_demo
netdev: rtl8139
- package: hello_world
netdev: virtio-net-pci
- package: hello_world
netdev: rtl8139
# Following packages require a netdev
- package: httpd
netdev: none
- package: testudp
netdev: none
include:
- arch: x86_64
packages: qemu-system-x86 libcap-ng-dev libseccomp-dev socat
- arch: aarch64
packages: qemu-system-aarch64

- arch: x86_64
package: rusty_demo
flags: --features pci-ids --virtiofsd
- arch: aarch64
package: rusty_demo
flags: --features pci-ids
- package: httpd
flags: --features ci,dhcpv4
- package: testudp
flags: --features udp,dhcpv4
- package: hello_world
flags: --no-default-features --microvm

steps:
- name: Checkout hermit-rs
uses: actions/checkout@v4
@@ -130,90 +185,38 @@ jobs:
- name: Install QEMU
run: |
sudo apt-get update
sudo apt-get install qemu-system-x86 libcap-ng-dev libseccomp-dev socat
sudo apt-get install ${{ matrix.packages }}
- uses: mkroening/rust-toolchain-toml@main
- uses: mkroening/rust-toolchain-toml@main
with:
toolchain-file: 'kernel/rust-toolchain.toml'
- uses: Swatinem/rust-cache@v2
with:
save-if: ${{ github.ref == 'refs/heads/main' }}
key: ${{ matrix.arch }}-${{ matrix.profile }}
save-if: ${{ github.ref == 'refs/heads/main' && matrix.package == 'rusty_demo' }}
workspaces: |
.
kernel
kernel/hermit-builtins
- name: Download loader
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: hermit-os/loader
file: rusty-loader-x86_64
file: rusty-loader-${{ matrix.arch }}
- name: Install virtiofsd
if: ${{ matrix.arch == 'x86_64' && matrix.package == 'rusty_demo' }}
run: cargo install virtiofsd
- name: rusty_demo with pci-ids and virtiofsd
run: cargo xtask ci qemu --arch x86_64 --package rusty_demo --features pci-ids --virtiofsd
- name: rusty_demo with pci-ids and virtiofsd (release)
run: cargo xtask ci qemu --arch x86_64 --package rusty_demo --features pci-ids --virtiofsd --release
- name: httpd with virtio-net-pci and dhcpv4
run: cargo xtask ci qemu --arch x86_64 --package httpd --features ci,dhcpv4 --netdev virtio-net-pci
- name: httpd with virtio-net-pci and dhcpv4 (release)
run: cargo xtask ci qemu --arch x86_64 --package httpd --features ci,dhcpv4 --netdev virtio-net-pci --release
- name: httpd with rtl8139 and dhcpv4
run: cargo xtask ci qemu --arch x86_64 --package httpd --features ci,dhcpv4,rtl8139 --netdev rtl8139
- name: httpd with rtl8139 and dhcpv4 (release)
run: cargo xtask ci qemu --arch x86_64 --package httpd --features ci,dhcpv4,rtl8139 --netdev rtl8139 --release
- name: hello_world on microVM (release)
run: cargo xtask ci qemu --arch x86_64 --package hello_world --no-default-features --microvm --release
- name: testudp with virtio-net-pci and dhcpv4
run: cargo xtask ci qemu --arch x86_64 --package testudp --features udp,dhcpv4 --netdev virtio-net-pci
- name: testudp with virtio-net-pci and dhcpv4 (release)
run: cargo xtask ci qemu --arch x86_64 --package testudp --features udp,dhcpv4 --netdev virtio-net-pci --release

run-aarch64:
name: Run Hermit for Rust (aarch64)
runs-on: ubuntu-latest
defaults:
run:
working-directory: kernel
steps:
- name: Checkout hermit-rs
uses: actions/checkout@v4
with:
repository: hermit-os/hermit-rs
submodules: true
- name: Remove hermit-kernel submodule
run: git rm -r kernel
working-directory: .
- name: Checkout hermit-kernel
uses: actions/checkout@v4
with:
path: kernel
- name: Download loader
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: hermit-os/loader
file: rusty-loader-aarch64
- uses: mkroening/rust-toolchain-toml@main
- uses: mkroening/rust-toolchain-toml@main
with:
toolchain-file: 'kernel/rust-toolchain.toml'
- name: Install QEMU
run: |
sudo apt-get update
sudo apt-get install qemu-system-aarch64
- uses: Swatinem/rust-cache@v2
with:
save-if: ${{ github.ref == 'refs/heads/main' }}
workspaces: |
.
kernel
kernel/hermit-builtins
- name: rusty_demo with pci-ids
run: cargo xtask ci qemu --arch aarch64 --package rusty_demo --features pci-ids
- name: rusty_demo with pci-ids (release)
run: cargo xtask ci qemu --arch aarch64 --package rusty_demo --features pci-ids --release
- name: httpd with dhcpv4
run: cargo xtask ci qemu --arch aarch64 --package httpd --features ci,dhcpv4 --netdev virtio-net-pci
- name: httpd with dhcpv4 (release)
run: cargo xtask ci qemu --arch aarch64 --package httpd --features ci,dhcpv4 --netdev virtio-net-pci --release
- name: Run VM
# cargo accepts multiple 'features' flags
# The '… && … || …' expression is like a ternary operator
run: >
cargo xtask ci qemu
--arch ${{ matrix.arch }}
--package ${{ matrix.package }}
${{ matrix.flags }}
${{ matrix.netdev == 'rtl8139' && '--features rtl8139' || '' }}
${{ matrix.netdev != 'none' && format('--netdev {0}', matrix.netdev) || '' }}
--profile ${{ matrix.profile }}
run-x86_64-kvm:
name: Run Hermit for Rust (x86_64 + kvm)
@@ -274,6 +277,10 @@ jobs:
- uses: Swatinem/rust-cache@v2
with:
save-if: ${{ github.ref == 'refs/heads/main' }}
workspaces: |
.
kernel
kernel/hermit-builtins
- name: rusty_demo on Uhyve
run: cargo xtask ci uhyve --arch x86_64 --package rusty_demo
- name: rusty_demo on Uhyve (release)