Skip to content

Commit

Permalink
examples/rust: define rust-seL4 dependency via git
Browse files Browse the repository at this point in the history
What was I thinking! I've used this feature before! I can just specify
my fork instead of getting the CI (and users) to manually checkout
a branch of the repository. Then we upstream the changes we should
be able to transparently switch to the coliasgroup remote.
  • Loading branch information
Ivan-Velickovic committed Sep 23, 2023
1 parent 7ad16e2 commit 10576d2
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 25 deletions.
24 changes: 0 additions & 24 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@ jobs:
echo "${PWD}/zig-linux-x86_64-0.11.0/:$PATH" >> $GITHUB_PATH
- name: Install Rust
run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
- name: Checkout rust-seL4 project (temporary step)
uses: actions/checkout@v3
with:
repository: Ivan-Velickovic/rust-seL4
ref: dev
path: examples/rust/rust-seL4
- name: Build and run VMM examples
run: ./ci/examples.sh ${PWD}/sel4cp-sdk-1.2.6
shell: bash
Expand Down Expand Up @@ -81,12 +75,6 @@ jobs:
echo "${PWD}/zig-macos-x86_64-0.11.0/:$PATH" >> $GITHUB_PATH
- name: Install Rust
run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
- name: Checkout rust-seL4 project (temporary step)
uses: actions/checkout@v3
with:
repository: Ivan-Velickovic/rust-seL4
ref: dev
path: examples/rust/rust-seL4
- name: Build and run VMM examples
run: ./ci/examples.sh ${PWD}/sel4cp-sdk-1.2.6
shell: bash
Expand All @@ -109,12 +97,6 @@ jobs:
uses: cachix/install-nix-action@v22
with:
nix_path: nixpkgs=channel:nixos-unstable
- name: Checkout rust-seL4 project (temporary step)
uses: actions/checkout@v3
with:
repository: Ivan-Velickovic/rust-seL4
ref: dev
path: examples/rust/rust-seL4
- name: Build and run VMM examples
run: nix-shell --pure --run "./ci/examples.sh ${PWD}/sel4cp-sdk-1.2.6"
- name: Upload built system images
Expand All @@ -136,12 +118,6 @@ jobs:
uses: cachix/install-nix-action@v22
with:
nix_path: nixpkgs=channel:nixos-unstable
- name: Checkout rust-seL4 project (temporary step)
uses: actions/checkout@v3
with:
repository: Ivan-Velickovic/rust-seL4
ref: dev
path: examples/rust/rust-seL4
- name: Build and run VMM examples
run: nix-shell --pure --run "./ci/examples.sh ${PWD}/sel4cp-sdk-1.2.6"
- name: Upload built system images
Expand Down
21 changes: 21 additions & 0 deletions examples/rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion examples/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,7 @@ name = "vmm"
path = "src/vmm.rs"

[dependencies.sel4cp]
path = "rust-seL4/crates/sel4cp"
# Temporarily use fork of rust-seL4 until all the changes
# we need are upstreamed
git = "https://github.com/Ivan-Velickovic/rust-seL4"
branch = "dev"

0 comments on commit 10576d2

Please sign in to comment.