From 76561dcc94425a2f76589fc94c7e3c029e03c3d3 Mon Sep 17 00:00:00 2001
From: Carol Yeh <caroljye@amazon.com>
Date: Wed, 29 Jan 2025 16:41:19 -0800
Subject: [PATCH] ci: change rust-toolchain format to toml (#5070)

---
 .github/workflows/ci_rust.yml                 | 21 +++++++++++++++----
 bindings/rust/extended/rust-toolchain         |  1 -
 bindings/rust/extended/rust-toolchain.toml    |  2 ++
 bindings/rust/standard/bench/rust-toolchain   |  1 -
 .../rust/standard/bench/rust-toolchain.toml   |  2 ++
 bindings/rust/standard/rust-toolchain         |  1 -
 bindings/rust/standard/rust-toolchain.toml    |  2 ++
 7 files changed, 23 insertions(+), 7 deletions(-)
 delete mode 100644 bindings/rust/extended/rust-toolchain
 create mode 100644 bindings/rust/extended/rust-toolchain.toml
 delete mode 100644 bindings/rust/standard/bench/rust-toolchain
 create mode 100644 bindings/rust/standard/bench/rust-toolchain.toml
 delete mode 100644 bindings/rust/standard/rust-toolchain
 create mode 100644 bindings/rust/standard/rust-toolchain.toml

diff --git a/.github/workflows/ci_rust.yml b/.github/workflows/ci_rust.yml
index f4dfcc6d60c..2983b43ff1b 100644
--- a/.github/workflows/ci_rust.yml
+++ b/.github/workflows/ci_rust.yml
@@ -306,9 +306,15 @@ jobs:
 
       - uses: camshaft/rust-cache@v1
 
+      - uses: SebRollen/toml-action@v1.2.0
+        id: read_toml
+        with:
+          file: '${{env.ROOT_PATH}}/rust-toolchain.toml'
+          field: 'toolchain.channel'
+
       # Enforce that clippy's msrv matches rust-toolchain
       - name: Check MSRV
-        run: grep $(cat ${{env.ROOT_PATH}}/rust-toolchain) ${{env.ROOT_PATH}}/.clippy.toml
+        run: grep "${{steps.read_toml.outputs.value}}" ${{env.ROOT_PATH}}/.clippy.toml
 
       # We don't need to format the generated files,
       # but if they don't exist other code breaks.
@@ -327,15 +333,22 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
+
+      - uses: SebRollen/toml-action@v1.2.0
+        id: read_toml
+        with:
+          file: '${{env.ROOT_PATH}}/rust-toolchain.toml'
+          field: 'toolchain.channel'
+
       # Enforce crate msrv matches rust-toolchain
       - name: Check MSRV of s2n-tls
-        run: grep "rust-version = \"$(cat ${{env.ROOT_PATH}}/rust-toolchain)\"" ${{env.ROOT_PATH}}/s2n-tls/Cargo.toml
+        run: grep "rust-version = \"${{steps.read_toml.outputs.value}}\"" ${{env.ROOT_PATH}}/s2n-tls/Cargo.toml
 
       - name: Check MSRV of s2n-tls-sys
-        run: grep "rust-version = \"$(cat ${{env.ROOT_PATH}}/rust-toolchain)\"" ${{env.ROOT_PATH}}/s2n-tls-sys/templates/Cargo.template
+        run: grep "rust-version = \"${{steps.read_toml.outputs.value}}\"" ${{env.ROOT_PATH}}/s2n-tls-sys/templates/Cargo.template
 
       - name: Check MSRV of s2n-tokio
-        run: grep "rust-version = \"$(cat ${{env.ROOT_PATH}}/rust-toolchain)\"" ${{env.ROOT_PATH}}/s2n-tls-tokio/Cargo.toml
+        run: grep "rust-version = \"${{steps.read_toml.outputs.value}}\"" ${{env.ROOT_PATH}}/s2n-tls-tokio/Cargo.toml
 
   pcaps:
     runs-on: ubuntu-24.04
diff --git a/bindings/rust/extended/rust-toolchain b/bindings/rust/extended/rust-toolchain
deleted file mode 100644
index af92bdd9f58..00000000000
--- a/bindings/rust/extended/rust-toolchain
+++ /dev/null
@@ -1 +0,0 @@
-1.63.0
diff --git a/bindings/rust/extended/rust-toolchain.toml b/bindings/rust/extended/rust-toolchain.toml
new file mode 100644
index 00000000000..6a423bf4348
--- /dev/null
+++ b/bindings/rust/extended/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.63.0"
diff --git a/bindings/rust/standard/bench/rust-toolchain b/bindings/rust/standard/bench/rust-toolchain
deleted file mode 100644
index 2bf5ad0447d..00000000000
--- a/bindings/rust/standard/bench/rust-toolchain
+++ /dev/null
@@ -1 +0,0 @@
-stable
diff --git a/bindings/rust/standard/bench/rust-toolchain.toml b/bindings/rust/standard/bench/rust-toolchain.toml
new file mode 100644
index 00000000000..292fe499e3b
--- /dev/null
+++ b/bindings/rust/standard/bench/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "stable"
diff --git a/bindings/rust/standard/rust-toolchain b/bindings/rust/standard/rust-toolchain
deleted file mode 100644
index dc87e8af82f..00000000000
--- a/bindings/rust/standard/rust-toolchain
+++ /dev/null
@@ -1 +0,0 @@
-1.74.0
diff --git a/bindings/rust/standard/rust-toolchain.toml b/bindings/rust/standard/rust-toolchain.toml
new file mode 100644
index 00000000000..639f4f17d95
--- /dev/null
+++ b/bindings/rust/standard/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.74.0"