Skip to content

Commit 1e7441e

Browse files
authored
Merge branch 'master' into pront-reorg-int-tests
2 parents b7336f8 + aef66cf commit 1e7441e

File tree

11 files changed

+365
-84
lines changed

11 files changed

+365
-84
lines changed

.github/actions/setup/action.yml

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ inputs:
99
cargo-cache:
1010
required: false
1111
default: true
12-
description: "Cache Cargo registry, index, git DB, and ~/.cargo/bin. Enabled automatically if any Rust tools are requested."
12+
description: "Cache Cargo registry, index, and git DB. Enabled automatically if any Rust tools are requested."
1313

1414
mold:
1515
required: false
@@ -124,12 +124,11 @@ runs:
124124
EOF
125125
shell: bash
126126

127-
- name: Cache Cargo registry + index
127+
- name: Cache Cargo registry, index, and git DB
128128
if: ${{ inputs.cargo-cache == 'true' || env.NEEDS_RUST == 'true' }}
129129
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
130130
with:
131131
path: |
132-
~/.cargo/bin/
133132
~/.cargo/registry/index/
134133
~/.cargo/registry/cache/
135134
~/.cargo/git/db/
@@ -210,6 +209,24 @@ runs:
210209
if: ${{ inputs.vdev == 'true' }}
211210
uses: ./.github/actions/install-vdev
212211

212+
- name: Cache prepare.sh binaries
213+
id: cache-prepare-binaries
214+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
215+
with:
216+
path: |
217+
~/.cargo/bin/cargo-deb
218+
~/.cargo/bin/cross
219+
~/.cargo/bin/cargo-nextest
220+
~/.cargo/bin/cargo-deny
221+
~/.cargo/bin/cargo-msrv
222+
~/.cargo/bin/dd-rust-license-tool
223+
~/.cargo/bin/wasm-pack
224+
/usr/local/bin/markdownlint
225+
/usr/local/bin/datadog-ci
226+
key: ${{ runner.os }}-prepare-binaries-${{ hashFiles('scripts/environment/*') }}
227+
restore-keys: |
228+
${{ runner.os }}-prepare-binaries-
229+
213230
- name: Run prepare.sh
214231
shell: bash
215232
run: |

0 commit comments

Comments
 (0)