Merge pull request rust-osdev#1068 from rust-osdev/bishop-simplify-re…

…lease Use auto-release from crates.io to release
nicholasbishop · Mar 13, 2024 · 71bc7c1 · 71bc7c1
2 parents 79d6fa3 + 9e097c1
commit 71bc7c1
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 420 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: Swatinem/rust-cache@v2
-      - run: cargo xtask auto-release
+      - run: |
+          cargo install auto-release
+          auto-release --condition body -p uefi-raw -p uefi-macros -p uefi -p uefi-services
         env:
           CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
@@ -7,9 +7,7 @@ edition.workspace = true
 
 [dependencies]
 anyhow = "1.0.51"
-cargo_metadata = "0.18.1"
 clap = { version = "4.4.0", default-features = false, features = ["derive", "help", "usage", "std"] }
-crates-index = "2.3.0"
 fatfs = { version = "0.3.6", default-features = false, features = ["alloc", "std"] }
 fs-err = "2.6.0"
 heck = "0.4.0"
@@ -26,5 +24,5 @@ sha2 = "0.10.6"
 syn = { version = "2.0.0", features = ["full"] }
 tar = "0.4.38"
 tempfile = "3.6.0"
-ureq = { version = "2.8.0", features = ["http-interop"] }
 walkdir = "2.4.0"
+ureq = "2.8.0"
diff --git a/xtask/src/cargo.rs b/xtask/src/cargo.rs
@@ -17,7 +17,7 @@ pub enum Package {
 
 impl Package {
     /// Get package name.
-    pub fn name(self) -> &'static str {
+    fn name(self) -> &'static str {
         match self {
             Self::Uefi => "uefi",
             Self::UefiApp => "uefi_app",

diff --git a/xtask/src/main.rs b/xtask/src/main.rs
@@ -8,7 +8,6 @@ mod opt;
 mod pipe;
 mod platform;
 mod qemu;
-mod release;
 mod tpm;
 mod util;
 
@@ -315,6 +314,5 @@ fn main() -> Result<()> {
         Action::Run(qemu_opt) => run_vm_tests(qemu_opt),
         Action::Test(test_opt) => run_host_tests(test_opt),
         Action::Fmt(fmt_opt) => run_fmt_project(fmt_opt),
-        Action::AutoRelease(_) => release::auto_release(),
     }
 }
diff --git a/xtask/src/opt.rs b/xtask/src/opt.rs
@@ -74,7 +74,6 @@ pub enum Action {
     Run(QemuOpt),
     Test(TestOpt),
     Fmt(FmtOpt),
-    AutoRelease(AutoReleaseOpt),
 }
 
 /// Build all the uefi packages.
@@ -203,10 +202,3 @@ pub struct FmtOpt {
     #[clap(long, action)]
     pub check: bool,
 }
-
-/// Run the auto-release process (should only be run by Github Action).
-///
-/// This is run by the `release.yml` workflow. It is not intended to be run
-/// locally, and will exit immediately if `GITHUB_SHA` is not set.
-#[derive(Debug, Parser)]
-pub struct AutoReleaseOpt {}