Merge pull request #213 from rust-osdev/dev

dev: misc improvements

Author: phip1611

integration-test/.envrc renamed to .envrc

@@ -9,7 +9,7 @@
 name: "Integration Test"
 
 # Run on every push (tag, branch) and pull_request
-on: [pull_request, push, merge_group]
+on: [ pull_request, push, merge_group ]
 
 env:
   CARGO_TERM_COLOR: always
@@ -27,7 +27,7 @@ jobs:
           # This channel is only required to invoke "nix-shell".
           # Everything inside that nix-shell will use a pinned version of
           # nixpkgs.
-          nix_path: nixpkgs=channel:nixos-23.05
+          nix_path: nixpkgs=channel:nixos-23.11
       - uses: DeterminateSystems/magic-nix-cache-action@main
       - name: Set up cargo cache
         uses: actions/cache@v4
@@ -44,6 +44,6 @@ jobs:
           key: ${{ runner.os }}-${{ github.job }}-${{ hashFiles('integration-test/**/Cargo.toml', 'integration-test/**/Cargo.lock', 'integration-test/bins/rust-toolchain.toml') }}
       # Have all the "copying into Nix store" messages in a dedicated step for
       # better log visibility.
-      - run: cd integration-test && nix-shell --run "echo OK" && cd ..
+      - run: nix-shell --run "echo OK"
       # Now, run the actual test.
-      - run: cd integration-test && nix-shell --run ./run.sh && cd ..
+      - run: nix-shell --run run-integrationtest

.github/workflows/integrationtest.yml

@@ -9,7 +9,7 @@
 name: "Cargo workspace"
 
 # Run on every push (tag, branch) and pull_request
-on: [pull_request, push, workflow_dispatch, merge_group]
+on: [ pull_request, push, workflow_dispatch, merge_group ]
 
 env:
   CARGO_TERM_COLOR: always
@@ -20,7 +20,7 @@ jobs:
     name: build (msrv)
     uses: ./.github/workflows/_build-rust.yml
     with:
-      rust-version: 1.69.0 # MSRV
+      rust-version: 1.70.0 # MSRV
       do-style-check: false
       features: builder
 
@@ -46,7 +46,7 @@ jobs:
     needs: build_msrv
     uses: ./.github/workflows/_build-rust.yml
     with:
-      rust-version: 1.69.0 # MSRV
+      rust-version: 1.70.0 # MSRV
       do-style-check: false
       rust-target: thumbv7em-none-eabihf
       features: builder
@@ -103,7 +103,7 @@ jobs:
     needs: build_msrv
     uses: ./.github/workflows/_build-rust.yml
     with:
-      rust-version: 1.69.0 # MSRV
+      rust-version: 1.70.0 # MSRV
       do-style-check: true
       do-test: false
       features: builder

.github/workflows/rust.yml

@@ -9,9 +9,9 @@ exclude = [
 ]
 
 [workspace.dependencies]
-bitflags = "2"
-derive_more = { version = "0.99", default-features = false, features = ["display"] }
-log = { version = "0.4", default-features = false }
+bitflags = "2.0.2"
+derive_more = { version = "~0.99", default-features = false, features = ["display"] }
+log = { version = "~0.4", default-features = false }
 
 # This way, the "multiboot2" dependency in the multiboot2-header crate can be
 # referenced by version, while still the repository version is used

Cargo.lock

@@ -10,5 +10,11 @@ members = [
 codegen-units = 1
 lto = true
 
-[patch.crates-io]
-multiboot2 = { path = "../../multiboot2" }
+
+[workspace.dependencies]
+anyhow = { version = "1.0", default-features = false }
+log = { version = "0.4", default-features = false }
+multiboot2 = { path = "../../multiboot2", features = ["builder", "unstable"] }
+multiboot2-header = { path = "../../multiboot2-header", features = ["builder", "unstable"] }
+good_memory_allocator = "0.1"
+util = { path = "./util" }

Cargo.toml

@@ -1,16 +1,16 @@
 [package]
 name = "multiboot2_chainloader"
-description = "Multiboot chainloader that loads a Multiboot2 payload"
+description = "Integrationtest: Multiboot2 chainloader"
 version = "0.1.0"
 edition = "2021"
 publish = false
 
 [dependencies]
-util = { path = "../util" }
-multiboot2 = { path = "../../../multiboot2" }
-multiboot2-header = { path = "../../../multiboot2-header" }
-anyhow = { version = "1.0", default-features = false }
-elf_rs = "0.3"
-log = { version = "0.4", default-features = false }
-good_memory_allocator = "0.1"
+anyhow.workspace = true
+log.workspace = true
+good_memory_allocator.workspace = true
 multiboot = "0.8"
+multiboot2.workspace = true
+multiboot2-header.workspace = true
+util.workspace = true
+elf_rs = "0.3"

integration-test/bins/Cargo.lock

@@ -1,7 +1,8 @@
+use core::ops::Deref;
 use elf_rs::{ElfFile, ProgramHeaderEntry, ProgramType};
 use multiboot2::{
-    BootLoaderNameTag, CommandLineTag, MemoryArea, MemoryAreaType, MemoryMapTag,
-    ModuleTag,
+    BootLoaderNameTag, CommandLineTag, MemoryArea, MemoryAreaType, MemoryMapTag, ModuleTag,
+    SmbiosTag,
 };
 
 /// Loads the first module into memory. Assumes that the module is a ELF file.
@@ -56,6 +57,11 @@ pub fn load_module(mut modules: multiboot::information::ModuleIter) -> ! {
             elf_mod.end as u32,
             elf_mod.string.unwrap(),
         ))
+        // Test that we can add SmbiosTag multiple times.
+        .add_tag(SmbiosTag::new(1, 1, &[1, 2, 3]).deref())
+        .unwrap()
+        .add_tag(SmbiosTag::new(1, 2, &[1, 2, 3]).deref())
+        .expect("should allow tag multiple times")
         .build();
 
     log::info!(

integration-test/bins/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 name = "multiboot2_payload"
-description = "Multiboot2 integration test"
+description = "Integrationtest: Multiboot2 payload"
 version = "0.1.0"
 edition = "2021"
 publish = false
 
 [dependencies]
-multiboot2 = { path = "../../../multiboot2", features = ["builder", "unstable"] }
-util = { path = "../util" }
-anyhow = { version = "1.0", default-features = false }
-good_memory_allocator = "0.1"
-log = { version = "0.4", default-features = false }
+anyhow.workspace = true
+log.workspace = true
+good_memory_allocator.workspace = true
+multiboot2.workspace = true
+util.workspace = true
 x86 = "0.52"

integration-test/bins/multiboot2_chainloader/Cargo.toml

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2024-03-31" # rustc 1.79-nightly
+channel = "nightly-2024-04-30" # rustc 1.80-nightly
 profile = "default"
 components = [
     "rust-src",

integration-test/bins/multiboot2_chainloader/src/loader.rs

@@ -15,7 +15,8 @@ function fn_main() {
 
 function fn_build_rust_bins() {
     cd "bins"
-    cargo build --release
+    cargo --version
+    cargo build --release --verbose
     cd "$DIR"
 }