Skip to content
Merged
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
17 changes: 14 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@ jobs:
XLINGS_NON_INTERACTIVE: '1'
# The branch of the specification this backend is verified against. It
# moves with this one; when both are on `main` this becomes `main`.
OPENKAL_BRANCH: feat/openkal-closure
# The specification is taken from the branch of the same name where
# one exists, so a change spanning both repositories is tested as a
# whole. It was a fixed branch name until 2026-08-25 --- one merged
# long before, so every run since had been cloning a stale tree and
# reporting on it.
OPENKAL_BRANCH: ${{ github.head_ref || github.ref_name }}
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -122,8 +127,14 @@ jobs:
- name: The conformance suite runs on the machine with no operating system
run: |
set -euo pipefail
git clone --quiet --depth 1 -b "$OPENKAL_BRANCH" \
https://github.com/mcpplibs/openkal "$RUNNER_TEMP/spec"
git clone --quiet https://github.com/mcpplibs/openkal "$RUNNER_TEMP/spec"
if git -C "$RUNNER_TEMP/spec" rev-parse --verify --quiet \
"origin/$OPENKAL_BRANCH" > /dev/null; then
git -C "$RUNNER_TEMP/spec" checkout --quiet "origin/$OPENKAL_BRANCH"
echo "the specification is at $OPENKAL_BRANCH"
else
echo "the specification has no $OPENKAL_BRANCH; its default branch is used"
fi
Q=$(ls -d "$HOME"/.mcpp/registry/data/xpkgs/xim-x-qemu-riscv/*/bin/qemu-system-riscv64 | head -1)
export OPENKAL_CONFORMANCE_RUNNER="$Q -machine virt -nographic -no-reboot -bios default -kernel"
export OPENKAL_CONFORMANCE_IMPL_FEATURES=standalone
Expand Down
2 changes: 1 addition & 1 deletion examples/hello/mcpp.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ runner = ["qemu-system-riscv64", "-machine", "virt", "-nographic",
"-no-reboot", "-bios", "default", "-kernel"]

[dependencies]
openkal = "0.6.0"
openkal = "0.7.0"
openkal-opensbi = { path = "../.." }
4 changes: 2 additions & 2 deletions mcpp.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
[package]
namespace = "mcpplibs"
name = "openkal-opensbi"
version = "0.1.4"
version = "0.1.5"
description = "An implementation of openkal on the RISC-V Supervisor Binary Interface, portable across every machine whose firmware provides one"
license = "Apache-2.0"

Expand All @@ -33,7 +33,7 @@ repo = "https://github.com/mcpplibs/openkal-opensbi"
# The contract, not an implementation of it. Declaring it turns a version
# mismatch into a resolution-time message rather than a link-time one.
[dependencies]
openkal = "0.6.0"
openkal = "0.7.0"

# ⭐ WHAT RECEIVES CONTROL, WHICH IS A STATEMENT ABOUT THE PROGRAM.
#
Expand Down
Loading