diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fcb793e8..94663396 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,8 +39,17 @@ jobs: submodules: 'true' - name: Download Microkit SDK run: | +<<<<<<< Updated upstream wget https://github.com/seL4/microkit/releases/download/1.4.1/microkit-sdk-1.4.1-linux-x86-64.tar.gz tar xf microkit-sdk-1.4.1-linux-x86-64.tar.gz +======= + wget https://github.com/seL4/microkit/releases/download/1.4.0/microkit-sdk-1.4.0-linux-x86-64.tar.gz + tar xf microkit-sdk-1.4.0-linux-x86-64.tar.gz + - name: Install Nix + uses: cachix/install-nix-action@v25 + with: + nix_path: nixpkgs=channel:nixos-unstable +>>>>>>> Stashed changes - name: Install dependencies (via apt) # 'expect' is only a dependency for CI testing run: sudo apt update && sudo apt install -y make clang lld llvm qemu-system-arm device-tree-compiler expect gcc-aarch64-linux-gnu diff --git a/ci/examples.sh b/ci/examples.sh index 46ed5e43..9a0a0415 100755 --- a/ci/examples.sh +++ b/ci/examples.sh @@ -101,6 +101,23 @@ build_virtio() { MICROKIT_SDK=${SDK_PATH} } +build_virtio_snd() { + BOARD=$1 + CONFIG=$2 + echo "CI|INFO: building virtio sound example via Make with board: $BOARD and config: $CONFIG" + BUILD_DIR="${PWD}/build/examples/virtio-snd/make/${BOARD}/${CONFIG}" + mkdir -p ${BUILD_DIR} + pushd examples/virtio-snd + nix-shell + make -B \ + BUILD_DIR=${BUILD_DIR} \ + CONFIG=${CONFIG} \ + BOARD=${BOARD} \ + MICROKIT_SDK=${SDK_PATH} + exit + popd +} + simulate_zig() { echo "CI|INFO: simulating Zig example with config: $1" BUILD_DIR="${PWD}/build/examples/zig/qemu_virt_aarch64/${CONFIG}/${ZIG_OPTIMIZE}" @@ -153,8 +170,13 @@ simulate_zig "release" "ReleaseSmall" build_virtio "qemu_virt_aarch64" "debug" build_virtio "qemu_virt_aarch64" "release" -# build_virtio "odroidc4" "debug" -# build_virtio "odroidc4" "release" +build_virtio "odroidc4" "debug" +build_virtio "odroidc4" "release" + +build_virtio_snd "qemu_virt_aarch64" "debug" +build_virtio_snd "qemu_virt_aarch64" "release" +build_virtio_snd "odroidc4" "debug" +build_virtio_snd "odroidc4" "release" echo "" echo "CI|INFO: Passed all VMM tests"