Merge pull request #523 from mkroening/ci-loader-download

ci: download loader using GitHub CLI
hermit-os · Jan 26, 2024 · 062da84 · 062da84
2 parents 89124de + 1ca60a6
commit 062da84
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,6 +5,7 @@ on:
   merge_group:
 
 env:
+  GH_TOKEN: ${{ github.token }}
   RUSTFLAGS: -Dwarnings
   RUSTDOCFLAGS: -Dwarnings
 
@@ -58,11 +59,8 @@ jobs:
       with:
          submodules: true
     - uses: mkroening/rust-toolchain-toml@main
-    - name: Download loader
-      uses: dsaltares/[email protected]
-      with:
-        repo: hermit-os/loader
-        file: hermit-loader-x86_64
+    - name: Download loader  
+      run: gh release download --repo hermit-os/loader --pattern hermit-loader-x86_64
     - name: Build dev profile
       run: cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --package rusty_demo
     - name: Install uhyve
@@ -131,10 +129,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install ${{ matrix.packages }}
       - name: Download loader
-        uses: dsaltares/fetch-gh-release-asset@master
-        with:
-          repo: hermit-os/loader
-          file: hermit-loader-${{ matrix.arch }}
+        run: gh release download --repo hermit-os/loader --pattern hermit-loader-${{ matrix.arch }}
       - uses: mkroening/rust-toolchain-toml@main
       - uses: mkroening/rust-toolchain-toml@main
         with:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -6,6 +6,7 @@ on:
       - main
 
 env:
+  GH_TOKEN: ${{ github.token }}
   CARGO_TERM_COLOR: always
 
 jobs:
@@ -28,10 +29,7 @@ jobs:
     - name: Copy demo out of target dir
       run: cp target/x86_64-unknown-hermit/release/rusty_demo .
     - name: Download loader
-      uses: dsaltares/[email protected]
-      with:
-        repo: hermit-os/loader
-        file: hermit-loader-x86_64
+      run: gh release download --repo hermit-os/loader --pattern hermit-loader-x86_64
     - name: Create dockerfile for rusty_demo
       run: |
         cat << END > Dockerfile

diff --git a/kernel b/kernel
+7 −18		.github/workflows/ci.yml
+28 −0		.vscode/settings.json
+26 −45		Cargo.lock
+5 −2		Cargo.toml
+1 −1		rust-toolchain.toml
+20 −5		src/arch/aarch64/kernel/processor.rs
+7 −5		src/arch/aarch64/kernel/systemtime.rs
+0 −3		src/arch/mod.rs
+1 −3		src/arch/riscv64/kernel/interrupts.rs
+1 −2		src/arch/riscv64/kernel/mod.rs
+9 −2		src/arch/riscv64/kernel/processor.rs
+4 −3		src/arch/riscv64/kernel/systemtime.rs
+22 −20		src/arch/riscv64/mm/paging.rs
+1 −1		src/arch/x86_64/kernel/apic.rs
+12 −7		src/arch/x86_64/kernel/interrupts.rs
+1 −1		src/arch/x86_64/kernel/pic.rs
+1 −1		src/arch/x86_64/kernel/processor.rs
+1 −1		src/arch/x86_64/kernel/scheduler.rs
+5 −4		src/arch/x86_64/kernel/systemtime.rs
+2 −2		src/executor/device.rs
+1 −2		src/executor/network.rs
+6 −6		src/fs/mem.rs
+10 −12		src/syscalls/timer.rs
+7 −3		src/time.rs
+1 −1		xtask/src/ci/firecracker.rs
+1 −1		xtask/src/ci/qemu.rs