From af8e6cd656a523ab63aa574d57b2c02c61faca9b Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Sun, 12 May 2024 21:35:39 +0100
Subject: [PATCH 1/2] ci: read MSRV from manifest (#559)

---
 .github/workflows/ci.yml | 9 ++++++++-
 justfile                 | 7 +++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3ac91ec3..0d93bd1c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,14 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  read_msrv:
+    name: Read MSRV
+    uses: actions-rust-lang/msrv/.github/workflows/msrv.yml@main
+
   build_and_test:
+    needs:
+      - read_msrv
+
     strategy:
       fail-fast: false
       matrix:
@@ -24,7 +31,7 @@ jobs:
           - { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc }
           - { name: Windows (MinGW), os: windows-latest, triple: x86_64-pc-windows-gnu }
         version:
-          - { name: msrv, version: 1.70.0 }
+          - { name: msrv, version: "${{ needs.read_msrv.outputs.msrv }}" }
           - { name: stable, version: stable }
 
     name: ${{ matrix.target.name }} / ${{ matrix.version.name }}
diff --git a/justfile b/justfile
index 188ab13d..fe4b8a92 100644
--- a/justfile
+++ b/justfile
@@ -27,6 +27,13 @@ all_crate_features := if os() == "linux" {
     "--features='" + non_linux_all_features_list + "'"
 }
 
+m:
+    cargo metadata --format-version=1 \
+    | jq -r 'first(.packages[] | select(.source == null)) | .rust_version' \
+    | sed -E 's/^1\.([0-9]{2})$/1\.\1\.0/' \
+    | xargs -0 printf "msrv=%s" \
+    | tee /dev/stderr
+
 # Test workspace code.
 test toolchain="":
     cargo {{ toolchain }} test --lib --tests --package=actix-macros

From 2632c984cc0133f61a146938e6c921c89c81b793 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Sun, 12 May 2024 21:53:26 +0100
Subject: [PATCH 2/2] ci: fix nightly windows builds

---
 .github/workflows/ci-post-merge.yml | 4 ++++
 justfile                            | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml
index 27de0429..e6935198 100644
--- a/.github/workflows/ci-post-merge.yml
+++ b/.github/workflows/ci-post-merge.yml
@@ -41,6 +41,10 @@ jobs:
         if: matrix.target.os == 'ubuntu-latest'
         run: ./scripts/free-disk-space.sh
 
+      - name: Install nasm
+        if: matrix.target.os == 'windows-latest'
+        uses: ilammy/setup-nasm@v1.5.1
+
       - name: Install OpenSSL
         if: matrix.target.os == 'windows-latest'
         shell: bash
diff --git a/justfile b/justfile
index fe4b8a92..ad188756 100644
--- a/justfile
+++ b/justfile
@@ -8,10 +8,10 @@ downgrade-for-msrv:
 
 msrv := ```
     cargo metadata --format-version=1 \
-    | jq -r 'first(.packages[] | select(.source == null and .name == "actix-tls")) | .rust_version'
+    | jq -r 'first(.packages[] | select(.source == null and .name == "actix-tls")) | .rust_version' \
+    | sed -E 's/^1\.([0-9]{2})$/1\.\1\.0/'
 ```
-msrv_full := msrv + ".0" # comment out if the MSRV has a patch version specified
-msrv_rustup := "+" + msrv_full
+msrv_rustup := "+" + msrv
 
 non_linux_all_features_list := ```
     cargo metadata --format-version=1 \