From af84166081b4d0ddda0108670ca165e83b1d9746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Gonz=C3=A1lez?=
 <tomasagustin.gonzalezorlando@arm.com>
Date: Mon, 21 Aug 2023 17:01:58 +0100
Subject: [PATCH] Update MSRV to Rust 1.60
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tomás González <tomasagustin.gonzalezorlando@arm.com>
---
 ci.sh | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/ci.sh b/ci.sh
index 68b83a97..1ecc90a1 100755
--- a/ci.sh
+++ b/ci.sh
@@ -247,12 +247,14 @@ fi
 git submodule update --init
 
 if [ "$PROVIDER_NAME" = "coverage" ]; then
-    rustup toolchain install 1.57.0
+    rustup toolchain install 1.60.0
     PROVIDERS="trusted-service mbed-crypto tpm pkcs11"
     EXCLUDES="fuzz/*,e2e_tests/*,src/providers/cryptoauthlib/*,src/authenticators/jwt_svid_authenticator/*"
     UNIT_TEST_FEATURES="unix-peer-credentials-authenticator,direct-authenticator"
     # Install tarpaulin
-    cargo +1.57.0 install cargo-tarpaulin
+    #TODO: Remove the fixed version of cargo-tarpaulin when a new rust version
+    # is used (and the MSRV gets upgraded).
+    cargo +1.60.0 install cargo-tarpaulin --version 0.24.0
 
     mkdir -p reports
 
@@ -268,7 +270,7 @@ if [ "$PROVIDER_NAME" = "coverage" ]; then
         cp -r $(pwd)/e2e_tests/fake_mappings/* mappings
 
         # Start service
-        RUST_LOG=info cargo +1.57.0 tarpaulin --out Xml --forward --command build --exclude-files="$EXCLUDES" \
+        RUST_LOG=info cargo +1.60.0 tarpaulin --out Xml --forward --command build --exclude-files="$EXCLUDES" \
             --output-dir $(pwd)/reports/$provider --features="$provider-provider,direct-authenticator" \
             --run-types bins --timeout 3600 -- -c $CONFIG_PATH &
         wait_for_service
@@ -286,7 +288,7 @@ if [ "$PROVIDER_NAME" = "coverage" ]; then
         fi
 
         # Start service
-        RUST_LOG=info cargo +1.57.0 tarpaulin --out Xml --forward --command build --exclude-files="$EXCLUDES" \
+        RUST_LOG=info cargo +1.60.0 tarpaulin --out Xml --forward --command build --exclude-files="$EXCLUDES" \
             --output-dir $(pwd)/reports/$provider --features="$provider-provider,direct-authenticator" \
             --run-types bins --timeout 3600 -- -c $CONFIG_PATH &
         wait_for_service
@@ -296,7 +298,7 @@ if [ "$PROVIDER_NAME" = "coverage" ]; then
 
     # Run unit tests
     mkdir -p reports/unit
-    cargo +1.57.0 tarpaulin --tests --out Xml --features=$UNIT_TEST_FEATURES --exclude-files="$EXCLUDES" --output-dir $(pwd)/reports/unit
+    cargo +1.60.0 tarpaulin --tests --out Xml --features=$UNIT_TEST_FEATURES --exclude-files="$EXCLUDES" --output-dir $(pwd)/reports/unit
 
     exit 0
 fi
@@ -330,11 +332,10 @@ if [ "$PROVIDER_NAME" = "cargo-check" ]; then
     # - RHEL-9 (intend to support in the future)
     # - openSUSE Tumbleweed
     # - openSUSE Leap 15.4
-    # The oldest is currently in RHEL9, is 1.58.1.
 
-    rustup toolchain install 1.58.1
-    # The "jwt-svid-authenticator" can not be compiled on 1.58.1
-    RUST_BACKTRACE=1 cargo +1.58.1 check --release --features=all-providers,direct-authenticator,unix-peer-credentials-authenticator
+    rustup toolchain install 1.60.0
+    # TODO: The "jwt-svid-authenticator" is currently not being used.
+    RUST_BACKTRACE=1 cargo +1.60.0 check --release --features=all-providers,direct-authenticator,unix-peer-credentials-authenticator
 
     # Latest stable
     rustup toolchain install stable