From 233445a076a2f5ff653c94caed5d36329842201c Mon Sep 17 00:00:00 2001
From: Aram Grigoryan <132480+aram356@users.noreply.github.com>
Date: Tue, 20 May 2025 14:04:04 -0700
Subject: [PATCH 1/2] Use Rust toolchain version from .tool-versions for GitHub
 actions

---
 .github/workflows/format.yml | 7 ++++++-
 .github/workflows/test.yml   | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 659b109f..0fcd4b77 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -24,12 +24,17 @@ jobs:
             ~/.cargo/git/db/
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      
+      - name: Retrieve Rust version
+        id: rust-version
+        run: echo "rust-version=$(grep '^rust ' .tool-versions | awk '{print $2}')" >> $GITHUB_OUTPUT
+        shell: bash
 
       - name: Set up rust toolchain
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           components: "clippy, rustfmt"
-          toolchain: 1.83
+          toolchain: ${{ steps.rust-version.outputs.rust-version }}
 
       - name: Add wasm32-wasi target
         run: rustup target add wasm32-wasip1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 648bf160..3be6ecfe 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,10 +24,15 @@ jobs:
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
+      - name: Retrieve Rust version
+        id: rust-version
+        run: echo "rust-version=$(grep '^rust ' .tool-versions | awk '{print $2}')" >> $GITHUB_OUTPUT
+        shell: bash
+
       - name: Set up Rust tool chain
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.83
+          toolchain: ${{ steps.rust-version.outputs.rust-version }}
 
       - name: Add wasm32-wasi target
         run: rustup target add wasm32-wasip1

From 088a9fe1d64b8860a5b8c3a744c895ca007d134b Mon Sep 17 00:00:00 2001
From: Aram Grigoryan <132480+aram356@users.noreply.github.com>
Date: Tue, 27 May 2025 11:38:02 -0700
Subject: [PATCH 2/2] Added change to CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b0026c2..548d2fa7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,7 +29,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.0.6] - Scheduled
 
 ### Changed
--  Remove hard coded Fast ID in fastly.tom
+- Remove hard coded Fast ID in fastly.tom
+- Use Rust toolchain version from .tool-versions for GitHub actions 
 
 ## [1.0.5] - 2025-05-19