From 10576d2c6b8deb2ecac3e7cac1f040b2bcbb3792 Mon Sep 17 00:00:00 2001 From: Ivan Velickovic Date: Tue, 15 Aug 2023 23:52:45 +1000 Subject: [PATCH] examples/rust: define rust-seL4 dependency via git 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. --- .github/workflows/ci.yaml | 24 ------------------------ examples/rust/Cargo.lock | 21 +++++++++++++++++++++ examples/rust/Cargo.toml | 5 ++++- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0be10a0d..2af8c4c9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/examples/rust/Cargo.lock b/examples/rust/Cargo.lock index 36597f57..a0980ecb 100644 --- a/examples/rust/Cargo.lock +++ b/examples/rust/Cargo.lock @@ -352,6 +352,7 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "sel4" version = "0.1.0" +source = "git+https://github.com/Ivan-Velickovic/rust-seL4?branch=dev#ed6f197b0e6b0bfddd0c87a1555f44c16bb8961b" dependencies = [ "cfg-if", "sel4-config", @@ -361,6 +362,7 @@ dependencies = [ [[package]] name = "sel4-bitfield-parser" version = "0.1.0" +source = "git+https://github.com/Ivan-Velickovic/rust-seL4?branch=dev#ed6f197b0e6b0bfddd0c87a1555f44c16bb8961b" dependencies = [ "pest", "pest_derive", @@ -370,14 +372,17 @@ dependencies = [ [[package]] name = "sel4-bitfield-types" version = "0.1.0" +source = "git+https://github.com/Ivan-Velickovic/rust-seL4?branch=dev#ed6f197b0e6b0bfddd0c87a1555f44c16bb8961b" [[package]] name = "sel4-build-env" version = "0.1.0" +source = "git+https://github.com/Ivan-Velickovic/rust-seL4?branch=dev#ed6f197b0e6b0bfddd0c87a1555f44c16bb8961b" [[package]] name = "sel4-config" version = "0.1.0" +source = "git+https://github.com/Ivan-Velickovic/rust-seL4?branch=dev#ed6f197b0e6b0bfddd0c87a1555f44c16bb8961b" dependencies = [ "sel4-config-macros", ] @@ -385,6 +390,7 @@ dependencies = [ [[package]] name = "sel4-config-data" version = "0.1.0" +source = "git+https://github.com/Ivan-Velickovic/rust-seL4?branch=dev#ed6f197b0e6b0bfddd0c87a1555f44c16bb8961b" dependencies = [ "lazy_static", "sel4-build-env", @@ -395,6 +401,7 @@ dependencies = [ [[package]] name = "sel4-config-generic-macro-impls" version = "0.1.0" +source = "git+https://github.com/Ivan-Velickovic/rust-seL4?branch=dev#ed6f197b0e6b0bfddd0c87a1555f44c16bb8961b" dependencies = [ "fallible-iterator", "proc-macro2", @@ -406,6 +413,7 @@ dependencies = [ [[package]] name = "sel4-config-generic-types" version = "0.1.0" +source = "git+https://github.com/Ivan-Velickovic/rust-seL4?branch=dev#ed6f197b0e6b0bfddd0c87a1555f44c16bb8961b" dependencies = [ "serde", ] @@ -413,6 +421,7 @@ dependencies = [ [[package]] name = "sel4-config-macros" version = "0.1.0" +source = "git+https://github.com/Ivan-Velickovic/rust-seL4?branch=dev#ed6f197b0e6b0bfddd0c87a1555f44c16bb8961b" dependencies = [ "sel4-config-data", "sel4-config-generic-macro-impls", @@ -421,6 +430,7 @@ dependencies = [ [[package]] name = "sel4-dlmalloc" version = "0.1.0" +source = "git+https://github.com/Ivan-Velickovic/rust-seL4?branch=dev#ed6f197b0e6b0bfddd0c87a1555f44c16bb8961b" dependencies = [ "dlmalloc", "sel4-sync", @@ -429,14 +439,17 @@ dependencies = [ [[package]] name = "sel4-externally-shared" version = "0.1.0" +source = "git+https://github.com/Ivan-Velickovic/rust-seL4?branch=dev#ed6f197b0e6b0bfddd0c87a1555f44c16bb8961b" [[package]] name = "sel4-immediate-sync-once-cell" version = "0.1.0" +source = "git+https://github.com/Ivan-Velickovic/rust-seL4?branch=dev#ed6f197b0e6b0bfddd0c87a1555f44c16bb8961b" [[package]] name = "sel4-panicking" version = "0.1.0" +source = "git+https://github.com/Ivan-Velickovic/rust-seL4?branch=dev#ed6f197b0e6b0bfddd0c87a1555f44c16bb8961b" dependencies = [ "cfg-if", "sel4-immediate-sync-once-cell", @@ -447,10 +460,12 @@ dependencies = [ [[package]] name = "sel4-panicking-env" version = "0.1.0" +source = "git+https://github.com/Ivan-Velickovic/rust-seL4?branch=dev#ed6f197b0e6b0bfddd0c87a1555f44c16bb8961b" [[package]] name = "sel4-reserve-tls-on-stack" version = "0.1.0" +source = "git+https://github.com/Ivan-Velickovic/rust-seL4?branch=dev#ed6f197b0e6b0bfddd0c87a1555f44c16bb8961b" dependencies = [ "cfg-if", "sel4", @@ -459,6 +474,7 @@ dependencies = [ [[package]] name = "sel4-runtime-common" version = "0.1.0" +source = "git+https://github.com/Ivan-Velickovic/rust-seL4?branch=dev#ed6f197b0e6b0bfddd0c87a1555f44c16bb8961b" dependencies = [ "cfg-if", "sel4-dlmalloc", @@ -470,6 +486,7 @@ dependencies = [ [[package]] name = "sel4-rustfmt-helper" version = "0.1.0" +source = "git+https://github.com/Ivan-Velickovic/rust-seL4?branch=dev#ed6f197b0e6b0bfddd0c87a1555f44c16bb8961b" dependencies = [ "which", ] @@ -477,6 +494,7 @@ dependencies = [ [[package]] name = "sel4-sync" version = "0.1.0" +source = "git+https://github.com/Ivan-Velickovic/rust-seL4?branch=dev#ed6f197b0e6b0bfddd0c87a1555f44c16bb8961b" dependencies = [ "sel4", "sel4-immediate-sync-once-cell", @@ -485,6 +503,7 @@ dependencies = [ [[package]] name = "sel4-sys" version = "0.1.0" +source = "git+https://github.com/Ivan-Velickovic/rust-seL4?branch=dev#ed6f197b0e6b0bfddd0c87a1555f44c16bb8961b" dependencies = [ "bindgen", "glob", @@ -505,6 +524,7 @@ dependencies = [ [[package]] name = "sel4cp" version = "0.1.0" +source = "git+https://github.com/Ivan-Velickovic/rust-seL4?branch=dev#ed6f197b0e6b0bfddd0c87a1555f44c16bb8961b" dependencies = [ "cfg-if", "num_enum", @@ -521,6 +541,7 @@ dependencies = [ [[package]] name = "sel4cp-macros" version = "0.1.0" +source = "git+https://github.com/Ivan-Velickovic/rust-seL4?branch=dev#ed6f197b0e6b0bfddd0c87a1555f44c16bb8961b" dependencies = [ "proc-macro2", "quote", diff --git a/examples/rust/Cargo.toml b/examples/rust/Cargo.toml index 40d4e133..a96e1130 100644 --- a/examples/rust/Cargo.toml +++ b/examples/rust/Cargo.toml @@ -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"