Merge #22

22: Prepare 1.0.0 release r=pietroalbini a=pietroalbini Co-authored-by: Pietro Albini <[email protected]>
ferrocene · May 27, 2024 · 04c26e5 · 04c26e5
2 parents 324f37b + 32431c6
commit 04c26e5
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/criticalup-dev/Cargo.toml b/crates/criticalup-dev/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "criticalup-dev"
-version = "1.0.0-prerelease.1"
+version = "1.0.0"
 edition = "2021"
 publish = false
 

diff --git a/crates/criticalup-dev/src/main.rs b/crates/criticalup-dev/src/main.rs
@@ -10,19 +10,16 @@ fn main() {
         http_user_agent: concat!("criticalup/", env!("CARGO_PKG_VERSION"), " (dev)"),
         download_server_url: "https://criticalup-downloads-dev.ferrocene.dev".into(),
         customer_portal_url: "https://customers-dev.ferrocene.dev".into(),
-        // TODO: this key is not permanent, and must be changed before criticalup is released. The
-        // key was ephemeral when it was generated, and is not persisted anywhere. If we keep it
-        // as-is in the binaries we release, we won't be able to change the signing keys.
         trust_root: PublicKey {
             role: KeyRole::Root,
             algorithm: KeyAlgorithm::EcdsaP256Sha256Asn1SpkiDer,
             expiry: None,
             public: PublicKeyBytes::borrowed(&[
                 48, 89, 48, 19, 6, 7, 42, 134, 72, 206, 61, 2, 1, 6, 8, 42, 134, 72, 206, 61, 3, 1,
-                7, 3, 66, 0, 4, 145, 91, 152, 186, 48, 109, 66, 242, 84, 12, 150, 220, 124, 142,
-                196, 172, 189, 48, 90, 217, 123, 214, 67, 0, 139, 219, 17, 77, 185, 56, 152, 199,
-                5, 110, 157, 121, 0, 229, 172, 39, 92, 217, 125, 234, 61, 139, 231, 170, 22, 176,
-                174, 126, 100, 167, 20, 202, 250, 184, 237, 39, 79, 233, 75, 136,
+                7, 3, 66, 0, 4, 4, 66, 130, 231, 244, 177, 180, 109, 240, 145, 92, 154, 42, 34, 40,
+                21, 109, 38, 147, 239, 19, 129, 179, 54, 221, 145, 127, 59, 125, 173, 253, 205,
+                141, 183, 30, 200, 109, 54, 8, 135, 123, 21, 221, 154, 198, 91, 217, 137, 181, 90,
+                76, 144, 142, 231, 13, 92, 11, 9, 224, 176, 32, 177, 178, 237,
             ]),
         },
         test_mode: false,

diff --git a/crates/criticalup/Cargo.toml b/crates/criticalup/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "criticalup"
-version = "1.0.0-prerelease.1"
+version = "1.0.0"
 edition = "2021"
 authors = ["The CriticalUp Developers"]
 description = "Ferrocene toolchain manager"

diff --git a/crates/criticalup/src/main.rs b/crates/criticalup/src/main.rs
@@ -9,20 +9,17 @@ fn main() {
         name: "criticalup",
         http_user_agent: concat!("criticalup/", env!("CARGO_PKG_VERSION")),
         download_server_url: "https://criticalup-downloads.ferrocene.dev".into(),
-        customer_portal_url: "https://customers.ferrocene.dev/".into(),
-        // TODO: this key is not permanent, and must be changed before criticalup is released. The
-        // key was ephemeral when it was generated, and is not persisted anywhere. If we keep it
-        // as-is in the binaries we release, we won't be able to change the signing keys.
+        customer_portal_url: "https://customers.ferrocene.dev".into(),
         trust_root: PublicKey {
             role: KeyRole::Root,
             algorithm: KeyAlgorithm::EcdsaP256Sha256Asn1SpkiDer,
             expiry: None,
             public: PublicKeyBytes::borrowed(&[
                 48, 89, 48, 19, 6, 7, 42, 134, 72, 206, 61, 2, 1, 6, 8, 42, 134, 72, 206, 61, 3, 1,
-                7, 3, 66, 0, 4, 145, 91, 152, 186, 48, 109, 66, 242, 84, 12, 150, 220, 124, 142,
-                196, 172, 189, 48, 90, 217, 123, 214, 67, 0, 139, 219, 17, 77, 185, 56, 152, 199,
-                5, 110, 157, 121, 0, 229, 172, 39, 92, 217, 125, 234, 61, 139, 231, 170, 22, 176,
-                174, 126, 100, 167, 20, 202, 250, 184, 237, 39, 79, 233, 75, 136,
+                7, 3, 66, 0, 4, 68, 168, 159, 251, 220, 122, 178, 116, 99, 232, 131, 60, 141, 227,
+                61, 4, 83, 99, 18, 5, 142, 157, 245, 214, 142, 145, 36, 8, 168, 234, 188, 23, 236,
+                178, 151, 94, 119, 120, 150, 188, 22, 232, 0, 94, 59, 232, 134, 165, 12, 158, 7,
+                112, 156, 114, 150, 137, 52, 193, 254, 180, 81, 68, 158, 255,
             ]),
         },
         test_mode: false,

diff --git a/docs/src/using-criticalup/toolchain-management.rst b/docs/src/using-criticalup/toolchain-management.rst
@@ -24,7 +24,7 @@ Where the ``criticalup.toml`` contains the following content:
    manifest-version = 1
 
    [products.ferrocene]
-   release = "nightly-2024-04-03"
+   release = "stable-24.05.0"
    packages = [
       "rustc-${rustc-host}",
       "cargo-${rustc-host}",
@@ -37,6 +37,13 @@ CriticalUp understands ``${rustc-host}`` to mean the target triple of the host o
 
    Options for ``criticalup.toml`` are detailed in :ref:`the reference <criticalup_toml>`.
 
+.. caution::
+
+   The ``stable-24.05.0`` release only supports Linux. If you are using Windows or an
+   Apple Silicon macOS device, pick the latest version in the nightly channel
+   displayed in `releases.ferrocene.dev
+   <https://releases.ferrocene.dev/ferrocene/index.html>`_.
+
 .. _install_toolchain:
 
 Installing Toolchains
@@ -61,7 +68,7 @@ To change the installed products, edit the ``criticalup.toml`` as desired. For e
    manifest-version = 1
 
    [products.ferrocene]
-   release = "nightly-2024-04-03"
+   release = "stable-24.05.0"
    packages = [
       "rustc-${rustc-host}",
       "cargo-${rustc-host}",
@@ -97,4 +104,4 @@ disk space the ``clean`` command can help by deleting unused toolchains.
 
 .. code-block::
 
-   criticalup clean
+   criticalup clean