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
This commit is contained in:
parent
36bd807475
commit
436bbbe7ab
16
.github/workflows/linux.yml
vendored
16
.github/workflows/linux.yml
vendored
@ -487,14 +487,6 @@ jobs:
|
|||||||
cmake --build . --parallel 5
|
cmake --build . --parallel 5
|
||||||
cmake --install .
|
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
|
- name: cache rustls
|
||||||
if: contains(matrix.build.install_steps, 'rustls')
|
if: contains(matrix.build.install_steps, 'rustls')
|
||||||
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
|
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
|
||||||
@ -505,6 +497,14 @@ jobs:
|
|||||||
path: /home/runner/rustls
|
path: /home/runner/rustls
|
||||||
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ env.rustls-version }}
|
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'
|
- name: 'build rustls'
|
||||||
if: contains(matrix.build.install_steps, 'rustls') && steps.cache-rustls.outputs.cache-hit != 'true'
|
if: contains(matrix.build.install_steps, 'rustls') && steps.cache-rustls.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user