From: Viktor Szakats <commit@vsz.me>
Date: Thu, 10 Oct 2024 10:48:53 +0000 (+0200)
Subject: GHA/linux: skip installing rust if rustls is in cache
X-Git-Tag: curl-8_11_0~187
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=436bbbe7abebf0ee3a2b0bfb3ec5db7ce8c8db4c;p=thirdparty%2Fcurl.git

GHA/linux: skip installing rust if rustls is in cache

Rust remains installed for the Hyper job, because the rustls cache flag
is always false in that case.

Closes #15246
---

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 158a3077c5..dd22396686 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -487,14 +487,6 @@ jobs:
           cmake --build . --parallel 5
           cmake --install .
 
-      - if: contains(matrix.build.install_steps, 'rust')
-        run: |
-          cd $HOME
-          curl -sSf --compressed https://sh.rustup.rs/ | sh -s -- -y
-          source $HOME/.cargo/env
-          rustup toolchain install nightly
-        name: 'install rust'
-
       - name: cache rustls
         if: contains(matrix.build.install_steps, 'rustls')
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
@@ -505,6 +497,14 @@ jobs:
           path: /home/runner/rustls
           key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ env.rustls-version }}
 
+      - name: 'install rust'
+        if: contains(matrix.build.install_steps, 'rust') && steps.cache-rustls.outputs.cache-hit != 'true'
+        run: |
+          cd $HOME
+          curl -sSf --compressed https://sh.rustup.rs/ | sh -s -- -y
+          source $HOME/.cargo/env
+          rustup toolchain install nightly
+
       - name: 'build rustls'
         if: contains(matrix.build.install_steps, 'rustls') && steps.cache-rustls.outputs.cache-hit != 'true'
         run: |