ci: narrow win7 tls cache keys
This commit is contained in:
1 parent
94f473bd13
commit
8cc3e91e65
2 files changed
+10
-5
No files matched your search
@@ -169,6 +169,13 @@ test("Windows compatibility jobs cache Rust compilation without wrapping C or C+
|
|||||||
assert.doesNotMatch(win7, /^\s+(?:CC|CXX):/m);
|
assert.doesNotMatch(win7, /^\s+(?:CC|CXX):/m);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("Win7 TLS cache keys ignore the workspace lockfile", () => {
|
||||||
|
const win7 = job("windows-win7-bundle");
|
||||||
|
assert.ok(win7.includes("hashFiles('.github/fixtures/win7-aws-lc-cache/Cargo.toml', '.github/fixtures/win7-aws-lc-cache/Cargo.lock')"));
|
||||||
|
assert.ok(win7.includes("hashFiles('.github/fixtures/win7-openssl-cache/Cargo.toml', '.github/fixtures/win7-openssl-cache/Cargo.lock')"));
|
||||||
|
assert.doesNotMatch(win7, /key: win7-(?:aws-lc|openssl).*hashFiles\('Cargo\.lock'/);
|
||||||
|
});
|
||||||
|
|
||||||
test("the planner uses the exact event base and preserves a single workflow cancellation scope", () => {
|
test("the planner uses the exact event base and preserves a single workflow cancellation scope", () => {
|
||||||
const changes = job("changes");
|
const changes = job("changes");
|
||||||
assert.ok(changes.includes("github.event.pull_request.base.sha || github.event.before"));
|
assert.ok(changes.includes("github.event.pull_request.base.sha || github.event.before"));
|
||||||
|
|||||||
@@ -351,10 +351,8 @@ jobs:
|
|||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: ${{ runner.temp }}/win7-aws-lc-install
|
path: ${{ runner.temp }}/win7-aws-lc-install
|
||||||
# Key covers the workspace Cargo.lock too: a main-workspace aws-lc-sys
|
# The fixture manifest and lockfile define the prebuilt AWS-LC artifact.
|
||||||
# bump must rebuild the prebuilt artifacts instead of reusing the
|
key: win7-aws-lc-v3-${{ runner.os }}-${{ env.WIN7_NIGHTLY_TOOLCHAIN }}-${{ hashFiles('.github/fixtures/win7-aws-lc-cache/Cargo.toml', '.github/fixtures/win7-aws-lc-cache/Cargo.lock') }}
|
||||||
# cached headers/lib for a stale version.
|
|
||||||
key: win7-aws-lc-v3-${{ runner.os }}-${{ env.WIN7_NIGHTLY_TOOLCHAIN }}-${{ hashFiles('Cargo.lock', '.github/fixtures/win7-aws-lc-cache/Cargo.lock') }}
|
|
||||||
|
|
||||||
- name: Build Win7 AWS-LC cache
|
- name: Build Win7 AWS-LC cache
|
||||||
if: steps.aws-lc-cache.outputs.cache-hit != 'true'
|
if: steps.aws-lc-cache.outputs.cache-hit != 'true'
|
||||||
@@ -449,7 +447,7 @@ jobs:
|
|||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: ${{ runner.temp }}/win7-openssl-install
|
path: ${{ runner.temp }}/win7-openssl-install
|
||||||
key: win7-openssl-v1-${{ runner.os }}-${{ env.WIN7_NIGHTLY_TOOLCHAIN }}-${{ hashFiles('Cargo.lock', '.github/fixtures/win7-openssl-cache/Cargo.lock') }}
|
key: win7-openssl-v1-${{ runner.os }}-${{ env.WIN7_NIGHTLY_TOOLCHAIN }}-${{ hashFiles('.github/fixtures/win7-openssl-cache/Cargo.toml', '.github/fixtures/win7-openssl-cache/Cargo.lock') }}
|
||||||
|
|
||||||
- name: Build Win7 OpenSSL cache
|
- name: Build Win7 OpenSSL cache
|
||||||
if: steps.openssl-cache.outputs.cache-hit != 'true'
|
if: steps.openssl-cache.outputs.cache-hit != 'true'
|
||||||
|
|||||||
Reference in new issue
Block a user