Transition to a workspace

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: Swatinem/rust-cache@v2
-      - run: cargo check
-      - run: cargo test
-      - run: cargo fmt -- --check
-      - run: cargo clippy -- -D warnings
+      - run: cargo check --workspace
+      - run: cargo test --workspace
+      - run: cargo fmt --all -- --check
+      - run: cargo clippy --workspace -- -D warnings

Cargo.toml

@@ -1,9 +1,6 @@
-[package]
-name = "ovmf-prebuilt"
-version = "0.1.0"
-authors = ["Philipp Oppermann <dev@phil-opp.com>"]
-edition = "2021"
+[workspace]
+members = ["build-edk2"]
+resolver = "2"
 
-[dependencies]
-anyhow = "1.0.71"
-clap = { version = "4.2.7", features = ["derive"] }
+[workspace.package]
+edition = "2021"

build-edk2/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "build-edk2"
+version = "0.0.0"
+publish = false
+edition.workspace = true
+
+[dependencies]
+anyhow = "1.0.0"
+clap = { version = "4.0.0", features = ["derive"] }

src/main.rs → build-edk2/src/main.rs

@@ -79,7 +79,7 @@ fn build_tarball(opt: &Opt, release: &Release) -> Result<PathBuf> {
         &format!("git_tag={}", release.edk2_git_tag),
         "--build-arg",
         &format!("bin_dir={}-bin", release.prebuilt_git_tag),
-        ".",
+        "build-edk2",
     ]);
     println!("run: {cmd:?}");
     let status = cmd.status()?;