automate, automate

18 files changed, 49 insertions, 16 deletions

diff --git a/asm-toolchain b/asm-toolchain
new file mode 100644
index 0000000..a36829b
--- /dev/null
+++ b/asm-toolchain
@@ -0,0 +1 @@
+nightly-2020-08-26
diff --git a/asm.rs b/asm.rs
index 0bbf0c7..f5b0179 100644
--- a/asm.rs
+++ b/asm.rs
@@ -14,11 +14,20 @@
 //! assembly.
 //!
 //! For developers and contributors to `cortex-m`, this setup means that they don't have to install
-//! any binutils, assembler, or C compiler to hack on the crate. All they need is a nightly rustc
-//! and run `cargo xtask assemble` to rebuild the archives from this file.
+//! any binutils, assembler, or C compiler to hack on the crate. All they need is to run `cargo
+//! xtask assemble` to rebuild the archives from this file.
 //!
 //! Cool, right?
 //!
+//! # Rust version management
+//!
+//! Since inline assembly is still unstable, and we want to ensure that the created blobs are
+//! up-to-date in CI, we have to pin the nightly version we use for this. The nightly toolchain is
+//! stored in `asm-toolchain`.
+//!
+//! The `cargo xtask` automation will automatically install the `asm-toolchain` as well as all
+//! Cortex-M targets needed to generate the blobs.
+//!
 //! [linker plugin LTO]: https://doc.rust-lang.org/stable/rustc/linker-plugin-lto.html
 
 #![feature(asm)]
diff --git a/bin/thumbv6m-none-eabi-lto.a b/bin/thumbv6m-none-eabi-lto.a
index f32cbe1..4d2f02c 100644
--- a/bin/thumbv6m-none-eabi-lto.a
+++ b/bin/thumbv6m-none-eabi-lto.a
diff --git a/bin/thumbv6m-none-eabi.a b/bin/thumbv6m-none-eabi.a
index 563030a..beedd73 100644
--- a/bin/thumbv6m-none-eabi.a
+++ b/bin/thumbv6m-none-eabi.a
diff --git a/bin/thumbv7em-none-eabi-lto.a b/bin/thumbv7em-none-eabi-lto.a
index e60db30..7b8a4f8 100644
--- a/bin/thumbv7em-none-eabi-lto.a
+++ b/bin/thumbv7em-none-eabi-lto.a
diff --git a/bin/thumbv7em-none-eabi.a b/bin/thumbv7em-none-eabi.a
index 8b86100..588e5cd 100644
--- a/bin/thumbv7em-none-eabi.a
+++ b/bin/thumbv7em-none-eabi.a
diff --git a/bin/thumbv7em-none-eabihf-lto.a b/bin/thumbv7em-none-eabihf-lto.a
index 4821df3..4efadd8 100644
--- a/bin/thumbv7em-none-eabihf-lto.a
+++ b/bin/thumbv7em-none-eabihf-lto.a
diff --git a/bin/thumbv7em-none-eabihf.a b/bin/thumbv7em-none-eabihf.a
index 5dfdf37..fd08ba5 100644
--- a/bin/thumbv7em-none-eabihf.a
+++ b/bin/thumbv7em-none-eabihf.a
diff --git a/bin/thumbv7m-none-eabi-lto.a b/bin/thumbv7m-none-eabi-lto.a
index de66882..28e5860 100644
--- a/bin/thumbv7m-none-eabi-lto.a
+++ b/bin/thumbv7m-none-eabi-lto.a
diff --git a/bin/thumbv7m-none-eabi.a b/bin/thumbv7m-none-eabi.a
index b47f571..4559ad4 100644
--- a/bin/thumbv7m-none-eabi.a
+++ b/bin/thumbv7m-none-eabi.a
diff --git a/bin/thumbv8m.base-none-eabi-lto.a b/bin/thumbv8m.base-none-eabi-lto.a
index 8c41d35..ee46792 100644
--- a/bin/thumbv8m.base-none-eabi-lto.a
+++ b/bin/thumbv8m.base-none-eabi-lto.a
diff --git a/bin/thumbv8m.base-none-eabi.a b/bin/thumbv8m.base-none-eabi.a
index 22aefda..26d25bd 100644
--- a/bin/thumbv8m.base-none-eabi.a
+++ b/bin/thumbv8m.base-none-eabi.a
diff --git a/bin/thumbv8m.main-none-eabi-lto.a b/bin/thumbv8m.main-none-eabi-lto.a
index 42417a4..e3aa0cf 100644
--- a/bin/thumbv8m.main-none-eabi-lto.a
+++ b/bin/thumbv8m.main-none-eabi-lto.a
diff --git a/bin/thumbv8m.main-none-eabi.a b/bin/thumbv8m.main-none-eabi.a
index 708b33a..10bbf53 100644
--- a/bin/thumbv8m.main-none-eabi.a
+++ b/bin/thumbv8m.main-none-eabi.a
diff --git a/bin/thumbv8m.main-none-eabihf-lto.a b/bin/thumbv8m.main-none-eabihf-lto.a
index 15ffca8..1c25494 100644
--- a/bin/thumbv8m.main-none-eabihf-lto.a
+++ b/bin/thumbv8m.main-none-eabihf-lto.a
diff --git a/bin/thumbv8m.main-none-eabihf.a b/bin/thumbv8m.main-none-eabihf.a
index 5e2f805..0651788 100644
--- a/bin/thumbv8m.main-none-eabihf.a
+++ b/bin/thumbv8m.main-none-eabihf.a
diff --git a/ci/install.sh b/ci/install.sh
index 855043d..fb3e52d 100644
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -5,19 +5,6 @@ main() {
         thumbv*-none-eabi*)
             rustup target add $TARGET
             ;;
-        x86_64-unknown-linux-gnu)
-            # We need *all* targets and nightly as we're checking the blobs.
-            rustup install nightly
-            rustup target add \
-                thumbv6m-none-eabi \
-                thumbv7m-none-eabi \
-                thumbv7em-none-eabi \
-                thumbv7em-none-eabihf \
-                thumbv8m.base-none-eabi \
-                thumbv8m.main-none-eabi \
-                thumbv8m.main-none-eabihf \
-                --toolchain nightly
-            ;;
     esac
 }
 
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 16132fb..ab59f57 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -4,6 +4,7 @@
 //!
 //! Also see the docs in `asm.rs`.
 
+use process::Stdio;
 use std::env::{self, current_dir};
 use std::{
     collections::BTreeMap,
@@ -11,9 +12,16 @@ use std::{
     process::{self, Command},
 };
 
+fn toolchain() -> String {
+    fs::read_to_string("asm-toolchain")
+        .unwrap()
+        .trim()
+        .to_string()
+}
+
 fn rustc() -> Command {
     let mut cmd = Command::new("rustc");
-    cmd.arg("+nightly");
+    cmd.arg(format!("+{}", toolchain()));
     cmd
 }
 
@@ -105,6 +113,34 @@ static TARGETS: &[(&str, &[&str])] = &[
 ];
 
 fn assemble_blobs() {
+    let mut cmd = rustc();
+    cmd.arg("-V");
+    cmd.stdout(Stdio::null());
+    let status = cmd.status().unwrap();
+
+    if !status.success() {
+        let toolchain = toolchain();
+        println!(
+            "asm toolchain {} does not seem to be installed. installing it now.",
+            toolchain
+        );
+
+        let mut rustup = Command::new("rustup");
+        let status = rustup.arg("install").arg(&toolchain).status().unwrap();
+        assert!(status.success(), "rustup command failed: {:?}", rustup);
+
+        let mut rustup = Command::new("rustup");
+        let status = rustup
+            .arg("target")
+            .arg("add")
+            .args(TARGETS.iter().map(|(target, _)| *target))
+            .arg("--toolchain")
+            .arg(toolchain)
+            .status()
+            .unwrap();
+        assert!(status.success(), "rustup command failed: {:?}", rustup);
+    }
+
     for (target, cfgs) in TARGETS {
         println!("building artifacts for {}", target);
         assemble(target, cfgs);