From 2632c984cc0133f61a146938e6c921c89c81b793 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sun, 12 May 2024 21:53:26 +0100 Subject: [PATCH] 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 \