Skip to content

Commit 62420ee

Browse files
rbtcollinsrbtcollins
committed
Merge remote-tracking branch 'upstream/master' into renovate/configure
2 parents 81e6d8d + 9c65814 commit 62420ee

13 files changed

+27
-24
lines changed

‎.github/workflows/centos-fmt-clippy-on-all.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
run: |
4040
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
4141
- name: Cache cargo registry and git trees
42-
uses: actions/cache@v2
42+
uses: actions/cache@v3
4343
with:
4444
path: |
4545
~/.cargo/registry
@@ -51,7 +51,7 @@ jobs:
5151
echo "::set-output name=rust_hash::$(rustc -Vv | grep commit-hash | awk '{print $2}')"
5252
shell: bash
5353
- name: Cache cargo build
54-
uses: actions/cache@v2
54+
uses: actions/cache@v3
5555
with:
5656
path: target
5757
key: ${{ github.base_ref }}-${{ github.head_ref }}-${{ runner.os }}-cargo-clippy-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}
@@ -82,9 +82,9 @@ jobs:
8282
sh ./ci/raw_init.sh
8383
- name: Run shell checks
8484
run: |
85-
shellcheck -s dash -- rustup-init.sh
86-
git ls-files -- '*.sh' | xargs shellcheck -s dash -e SC1090
87-
git ls-files -- '*.bash' | xargs shellcheck -s bash -e SC1090
85+
shellcheck -x -s dash -- rustup-init.sh
86+
git ls-files -- '*.sh' | xargs shellcheck -x -s dash
87+
git ls-files -- '*.bash' | xargs shellcheck -x -s bash
8888
- name: Run formatting checks
8989
run: |
9090
cargo fmt --all --check

‎.github/workflows/linux-builds-on-master.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
echo "SKIP_TESTS=yes" >> $GITHUB_ENV
5858
if: matrix.run_tests == ''
5959
- name: Cache cargo registry and git trees
60-
uses: actions/cache@v2
60+
uses: actions/cache@v3
6161
with:
6262
path: |
6363
~/.cargo/registry
@@ -69,7 +69,7 @@ jobs:
6969
echo "::set-output name=rust_hash::$(rustc -Vv | grep commit-hash | awk '{print $2}')"
7070
shell: bash
7171
- name: Cache cargo build
72-
uses: actions/cache@v2
72+
uses: actions/cache@v3
7373
with:
7474
path: target
7575
key: ${{ github.base_ref }}-${{ github.head_ref }}-${{ matrix.target }}-cargo-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}

‎.github/workflows/linux-builds-on-pr.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
echo "SKIP_TESTS=yes" >> $GITHUB_ENV
5151
if: matrix.run_tests == ''
5252
- name: Cache cargo registry and git trees
53-
uses: actions/cache@v2
53+
uses: actions/cache@v3
5454
with:
5555
path: |
5656
~/.cargo/registry
@@ -62,7 +62,7 @@ jobs:
6262
echo "::set-output name=rust_hash::$(rustc -Vv | grep commit-hash | awk '{print $2}')"
6363
shell: bash
6464
- name: Cache cargo build
65-
uses: actions/cache@v2
65+
uses: actions/cache@v3
6666
with:
6767
path: target
6868
key: ${{ github.base_ref }}-${{ github.head_ref }}-${{ matrix.target }}-cargo-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}

‎.github/workflows/linux-builds-on-stable.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
echo "SKIP_TESTS=yes" >> $GITHUB_ENV
8181
if: matrix.run_tests == ''
8282
- name: Cache cargo registry and git trees
83-
uses: actions/cache@v2
83+
uses: actions/cache@v3
8484
with:
8585
path: |
8686
~/.cargo/registry
@@ -92,7 +92,7 @@ jobs:
9292
echo "::set-output name=rust_hash::$(rustc -Vv | grep commit-hash | awk '{print $2}')"
9393
shell: bash
9494
- name: Cache cargo build
95-
uses: actions/cache@v2
95+
uses: actions/cache@v3
9696
with:
9797
path: target
9898
key: ${{ github.base_ref }}-${{ github.head_ref }}-${{ matrix.target }}-cargo-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}

‎.github/workflows/macos-builds-on-all.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
echo "SKIP_TESTS=" >> $GITHUB_ENV
4545
echo "LZMA_API_STATIC=1" >> $GITHUB_ENV
4646
- name: Cache cargo registry and git trees
47-
uses: actions/cache@v2
47+
uses: actions/cache@v3
4848
with:
4949
path: |
5050
~/.cargo/registry
@@ -56,7 +56,7 @@ jobs:
5656
echo "::set-output name=rust_hash::$(rustc -Vv | grep commit-hash | awk '{print $2}')"
5757
shell: bash
5858
- name: Cache cargo build
59-
uses: actions/cache@v2
59+
uses: actions/cache@v3
6060
with:
6161
path: target
6262
key: ${{ github.base_ref }}-${{ github.head_ref }}-${{ matrix.target }}-cargo-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}-3

‎.github/workflows/windows-builds-on-master.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
echo "TARGET=${{ matrix.target }}" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
6868
echo "SKIP_TESTS=${{ matrix.skip_tests }}" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
6969
- name: Cache cargo registry and git trees
70-
uses: actions/cache@v2
70+
uses: actions/cache@v3
7171
with:
7272
path: |
7373
~/.cargo/registry
@@ -79,7 +79,7 @@ jobs:
7979
echo "::set-output name=rust_hash::$(rustc -Vv | grep commit-hash | awk '{print $2}')"
8080
shell: bash
8181
- name: Cache cargo build
82-
uses: actions/cache@v2
82+
uses: actions/cache@v3
8383
with:
8484
path: target
8585
key: ${{ github.base_ref }}-${{ github.head_ref }}-${{ matrix.target }}-cargo-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}

‎.github/workflows/windows-builds-on-pr.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
echo "TARGET=${{ matrix.target }}" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
6262
echo "SKIP_TESTS=${{ matrix.skip_tests }}" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
6363
- name: Cache cargo registry and git trees
64-
uses: actions/cache@v2
64+
uses: actions/cache@v3
6565
with:
6666
path: |
6767
~/.cargo/registry
@@ -73,7 +73,7 @@ jobs:
7373
echo "::set-output name=rust_hash::$(rustc -Vv | grep commit-hash | awk '{print $2}')"
7474
shell: bash
7575
- name: Cache cargo build
76-
uses: actions/cache@v2
76+
uses: actions/cache@v3
7777
with:
7878
path: target
7979
key: ${{ github.base_ref }}-${{ github.head_ref }}-${{ matrix.target }}-cargo-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}

‎.github/workflows/windows-builds-on-stable.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
echo "TARGET=${{ matrix.target }}" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
6565
echo "SKIP_TESTS=${{ matrix.skip_tests }}" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
6666
- name: Cache cargo registry and git trees
67-
uses: actions/cache@v2
67+
uses: actions/cache@v3
6868
with:
6969
path: |
7070
~/.cargo/registry
@@ -76,7 +76,7 @@ jobs:
7676
echo "::set-output name=rust_hash::$(rustc -Vv | grep commit-hash | awk '{print $2}')"
7777
shell: bash
7878
- name: Cache cargo build
79-
uses: actions/cache@v2
79+
uses: actions/cache@v3
8080
with:
8181
path: target
8282
key: ${{ github.base_ref }}-${{ github.head_ref }}-${{ matrix.target }}-cargo-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}

‎ci/actions-templates/centos-fmt-clippy-template.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ jobs:
8282
sh ./ci/raw_init.sh
8383
- name: Run shell checks
8484
run: |
85-
shellcheck -s dash -- rustup-init.sh
86-
git ls-files -- '*.sh' | xargs shellcheck -s dash -e SC1090
87-
git ls-files -- '*.bash' | xargs shellcheck -s bash -e SC1090
85+
shellcheck -x -s dash -- rustup-init.sh
86+
git ls-files -- '*.sh' | xargs shellcheck -x -s dash
87+
git ls-files -- '*.bash' | xargs shellcheck -x -s bash
8888
- name: Run formatting checks
8989
run: |
9090
cargo fmt --all --check

‎ci/cirrus-templates/script.bash

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/bin/bash
22

33
set -ex
44

@@ -26,6 +26,7 @@ echo "Install Rustup using ./rustup-init.sh"
2626

2727
sh rustup-init.sh --default-toolchain=stable --profile=minimal -y
2828
# It's the equivalent of `source`
29+
# shellcheck source=src/cli/self_update/env.sh
2930
source "$HOME"/.cargo/env
3031

3132
echo "========="

0 commit comments

Comments
 (0)