Skip to content

Commit a447906

Browse files
committed
ci: regen workflows
1 parent ffba612 commit a447906

7 files changed

+42
-7
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,16 @@ jobs:
6060
with:
6161
path: ~/.cargo/git
6262
key: ${{ runner.os }}-cargo-gits-trimmed-${{ hashFiles('**/Cargo.lock') }}
63+
- name: Get rustc commit hash
64+
id: cargo-target-cache
65+
run: |
66+
echo "::set-output name=rust_hash::$(rustc -Vv | grep commit-hash | awk '{print $2}')"
67+
shell: bash
6368
- name: Cache cargo build
6469
uses: actions/cache@v1
6570
with:
6671
path: target
67-
key: ${{ runner.os }}-cargo-build-trimmed-${{ matrix.target }}-${{ hashFiles('**/Cargo.lock') }}
72+
key: ${{ matrix.target }}-cargo-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}
6873
- name: Install Rustup using ./rustup-init.sh
6974
run: |
7075
sh ./rustup-init.sh --default-toolchain=none --profile=minimal -y

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,16 @@ jobs:
5555
with:
5656
path: ~/.cargo/git
5757
key: ${{ runner.os }}-cargo-gits-trimmed-${{ hashFiles('**/Cargo.lock') }}
58+
- name: Get rustc commit hash
59+
id: cargo-target-cache
60+
run: |
61+
echo "::set-output name=rust_hash::$(rustc -Vv | grep commit-hash | awk '{print $2}')"
62+
shell: bash
5863
- name: Cache cargo build
5964
uses: actions/cache@v1
6065
with:
6166
path: target
62-
key: ${{ runner.os }}-cargo-build-trimmed-${{ matrix.target }}-${{ hashFiles('**/Cargo.lock') }}
67+
key: ${{ matrix.target }}-cargo-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}
6368
- name: Install Rustup using ./rustup-init.sh
6469
run: |
6570
sh ./rustup-init.sh --default-toolchain=none --profile=minimal -y

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,16 @@ jobs:
7474
with:
7575
path: ~/.cargo/git
7676
key: ${{ runner.os }}-cargo-gits-trimmed-${{ hashFiles('**/Cargo.lock') }}
77+
- name: Get rustc commit hash
78+
id: cargo-target-cache
79+
run: |
80+
echo "::set-output name=rust_hash::$(rustc -Vv | grep commit-hash | awk '{print $2}')"
81+
shell: bash
7782
- name: Cache cargo build
7883
uses: actions/cache@v1
7984
with:
8085
path: target
81-
key: ${{ runner.os }}-cargo-build-trimmed-${{ matrix.target }}-${{ hashFiles('**/Cargo.lock') }}
86+
key: ${{ matrix.target }}-cargo-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}
8287
- name: Install Rustup using ./rustup-init.sh
8388
run: |
8489
sh ./rustup-init.sh --default-toolchain=none --profile=minimal -y

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,16 @@ jobs:
5151
with:
5252
path: ~/.cargo/git
5353
key: ${{ runner.os }}-cargo-gits-trimmed-${{ hashFiles('**/Cargo.lock') }}
54+
- name: Get rustc commit hash
55+
id: cargo-target-cache
56+
run: |
57+
echo "::set-output name=rust_hash::$(rustc -Vv | grep commit-hash | awk '{print $2}')"
58+
shell: bash
5459
- name: Cache cargo build
5560
uses: actions/cache@v1
5661
with:
5762
path: target
58-
key: ${{ runner.os }}-cargo-build-trimmed-${{ matrix.target }}-${{ hashFiles('**/Cargo.lock') }}
63+
key: ${{ matrix.target }}-cargo-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}
5964
- name: Install Rustup using ./rustup-init.sh
6065
run: |
6166
sh ./rustup-init.sh --default-toolchain=none --profile=minimal -y

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,16 @@ jobs:
7373
with:
7474
path: ~/.cargo/git
7575
key: ${{ runner.os }}-cargo-gits-trimmed-${{ hashFiles('**/Cargo.lock') }}
76+
- name: Get rustc commit hash
77+
id: cargo-target-cache
78+
run: |
79+
echo "::set-output name=rust_hash::$(rustc -Vv | grep commit-hash | awk '{print $2}')"
80+
shell: bash
7681
- name: Cache cargo build
7782
uses: actions/cache@v1
7883
with:
7984
path: target
80-
key: ${{ runner.os }}-cargo-build-static-crt-trimmed-${{ matrix.target }}-${{ hashFiles('**/Cargo.lock') }}
85+
key: ${{ matrix.target }}-cargo-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}
8186
- name: Install Rustup using win.rustup.rs
8287
run: |
8388
# Disable the download progress bar which can cause perf issues

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,16 @@ jobs:
7070
with:
7171
path: ~/.cargo/git
7272
key: ${{ runner.os }}-cargo-gits-trimmed-${{ hashFiles('**/Cargo.lock') }}
73+
- name: Get rustc commit hash
74+
id: cargo-target-cache
75+
run: |
76+
echo "::set-output name=rust_hash::$(rustc -Vv | grep commit-hash | awk '{print $2}')"
77+
shell: bash
7378
- name: Cache cargo build
7479
uses: actions/cache@v1
7580
with:
7681
path: target
77-
key: ${{ runner.os }}-cargo-build-static-crt-trimmed-${{ matrix.target }}-${{ hashFiles('**/Cargo.lock') }}
82+
key: ${{ matrix.target }}-cargo-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}
7883
- name: Install Rustup using win.rustup.rs
7984
run: |
8085
# Disable the download progress bar which can cause perf issues

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,16 @@ jobs:
7373
with:
7474
path: ~/.cargo/git
7575
key: ${{ runner.os }}-cargo-gits-trimmed-${{ hashFiles('**/Cargo.lock') }}
76+
- name: Get rustc commit hash
77+
id: cargo-target-cache
78+
run: |
79+
echo "::set-output name=rust_hash::$(rustc -Vv | grep commit-hash | awk '{print $2}')"
80+
shell: bash
7681
- name: Cache cargo build
7782
uses: actions/cache@v1
7883
with:
7984
path: target
80-
key: ${{ runner.os }}-cargo-build-static-crt-trimmed-${{ matrix.target }}-${{ hashFiles('**/Cargo.lock') }}
85+
key: ${{ matrix.target }}-cargo-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}
8186
- name: Install Rustup using win.rustup.rs
8287
run: |
8388
# Disable the download progress bar which can cause perf issues

0 commit comments

Comments
 (0)