Merge pull request #971 from mkroening/hermit-loader

chore: rename rusty-loader to hermit-loader
hermit-os · Nov 2, 2023 · eab3fd3 · eab3fd3
2 parents a2f521f + 08975f5
commit eab3fd3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -111,9 +111,9 @@ jobs:
         uses: dsaltares/fetch-gh-release-asset@master
         with:
           repo: hermit-os/loader
-          file: rusty-loader-x86_64
+          file: hermit-loader-x86_64
       - name: Integration tests
-        run: cargo test --tests --no-fail-fast --target x86_64-unknown-none -- --bootloader_path=rusty-loader-x86_64
+        run: cargo test --tests --no-fail-fast --target x86_64-unknown-none -- --bootloader_path=hermit-loader-x86_64
         env:
           RUSTFLAGS:
 
@@ -202,10 +202,10 @@ jobs:
         uses: dsaltares/fetch-gh-release-asset@master
         with:
           repo: hermit-os/loader
-          file: rusty-loader-${{ matrix.arch }}
+          file: hermit-loader-${{ matrix.arch }}
       - name: Install virtiofsd
         if: ${{ matrix.arch == 'x86_64' && matrix.package == 'rusty_demo' }}
-        run: cargo install virtiofsd
+        run: cargo install --locked virtiofsd
       - name: Run VM
         # cargo accepts multiple 'features' flags
         # The '… && … || …' expression is like a ternary operator
@@ -249,12 +249,12 @@ jobs:
     - name: Download loader (x86_64)
       uses: dsaltares/fetch-gh-release-asset@master
       with:
-        file: rusty-loader-x86_64
+        file: hermit-loader-x86_64
         repo: hermit-os/loader
     - name: Download loader (x86_64-fc)
       uses: dsaltares/fetch-gh-release-asset@master
       with:
-        file: rusty-loader-x86_64-fc
+        file: hermit-loader-x86_64-fc
         repo: hermit-os/loader
     - name: Install firecracker
       run: |

diff --git a/tests/hermit_test_runner.py b/tests/hermit_test_runner.py
@@ -88,7 +88,7 @@ class QemuTestRunner(TestRunner):
     def __init__(self,
                  test_exe_path: str,
                  timeout_seconds: int,
-                 bootloader_path: str = '../loader/target/x86_64/debug/rusty-loader',
+                 bootloader_path: str = '../loader/target/x86_64/debug/hermit-loader',
                  num_cores=1,
                  memory_in_megabyte=512,
                  gdb_enabled=False):

diff --git a/xtask/src/ci/firecracker.rs b/xtask/src/ci/firecracker.rs
@@ -21,7 +21,7 @@ impl Firecracker {
 
 		let config = format!(
 			include_str!("firecracker_vm_config.json"),
-			kernel_image_path = "../rusty-loader-x86_64-fc",
+			kernel_image_path = "../hermit-loader-x86_64-fc",
 			initrd_path = self.build.image().display()
 		);
 		eprintln!("firecracker config");

diff --git a/xtask/src/ci/qemu.rs b/xtask/src/ci/qemu.rs
@@ -60,7 +60,7 @@ impl Qemu {
 		let qemu = cmd!(sh, "{qemu}")
 			.args(&["-display", "none"])
 			.args(&["-serial", "stdio"])
-			.args(&["-kernel", format!("../rusty-loader-{arch}").as_ref()])
+			.args(&["-kernel", format!("../hermit-loader-{arch}").as_ref()])
 			.args(self.machine_args())
 			.args(self.cpu_args())
 			.args(self.smp_args())