ci: stabilize Win7 sccache cache keys with /Brepro
This commit is contained in:
1 parent
99a8a5c318
commit
941796d5b3
4 files changed
+17
-2
No files matched your search
@@ -0,0 +1,5 @@
|
|||||||
|
# sccache hashes proc-macro DLLs as downstream compiler inputs.
|
||||||
|
target-applies-to-host = false
|
||||||
|
|
||||||
|
[host.x86_64-pc-windows-msvc]
|
||||||
|
rustflags = ["-Clink-arg=/Brepro"]
|
||||||
@@ -147,6 +147,12 @@ test("Windows compatibility jobs cache Rust compilation without wrapping C or C+
|
|||||||
assert.ok(win7.includes("fc920bf0ec8de6ee65d409111f7ec508035751ba"));
|
assert.ok(win7.includes("fc920bf0ec8de6ee65d409111f7ec508035751ba"));
|
||||||
assert.ok(win7.includes('version: "v0.16.0"'));
|
assert.ok(win7.includes('version: "v0.16.0"'));
|
||||||
assert.ok(win7.includes("sccache --show-stats"));
|
assert.ok(win7.includes("sccache --show-stats"));
|
||||||
|
for (const flag of ["-Z host-config", "-Z target-applies-to-host", "-Z build-std=std,panic_abort"]) assert.ok(win7.includes(flag));
|
||||||
|
assert.ok(win7.includes("--config .github/fixtures/win7-host-repro-config.toml"));
|
||||||
|
const hostConfig = readFileSync(new URL("../fixtures/win7-host-repro-config.toml", import.meta.url), "utf8");
|
||||||
|
assert.ok(hostConfig.includes("target-applies-to-host = false"));
|
||||||
|
assert.ok(hostConfig.includes('[host.x86_64-pc-windows-msvc]'));
|
||||||
|
assert.ok(hostConfig.includes('rustflags = ["-Clink-arg=/Brepro"]'));
|
||||||
assert.ok(win7.includes("--timings"));
|
assert.ok(win7.includes("--timings"));
|
||||||
assert.ok(win7.includes("name: DBX-win7-cargo-timings"));
|
assert.ok(win7.includes("name: DBX-win7-cargo-timings"));
|
||||||
assert.ok(win7.includes("path: target/cargo-timings/"));
|
assert.ok(win7.includes("path: target/cargo-timings/"));
|
||||||
|
|||||||
@@ -519,7 +519,10 @@ jobs:
|
|||||||
shell: pwsh
|
shell: pwsh
|
||||||
run: |
|
run: |
|
||||||
$env:TAURI_CONFIG = Get-Content src-tauri/tauri.webview2-win7-fixed.conf.json -Raw
|
$env:TAURI_CONFIG = Get-Content src-tauri/tauri.webview2-win7-fixed.conf.json -Raw
|
||||||
cargo build --locked --package dbx --release --features custom-protocol --target x86_64-win7-windows-msvc -Z build-std=std,panic_abort --timings
|
cargo -Z host-config -Z target-applies-to-host -Z build-std=std,panic_abort `
|
||||||
|
--config .github/fixtures/win7-host-repro-config.toml `
|
||||||
|
build --locked --package dbx --release --features custom-protocol `
|
||||||
|
--target x86_64-win7-windows-msvc --timings
|
||||||
|
|
||||||
- name: Upload Windows 7 Cargo timings
|
- name: Upload Windows 7 Cargo timings
|
||||||
if: always()
|
if: always()
|
||||||
|
|||||||
@@ -187,7 +187,8 @@ describe("Windows 7 fixed WebView2 runtime bundle", () => {
|
|||||||
expect(appCargoToml).toContain('custom-protocol = ["tauri/custom-protocol"]');
|
expect(appCargoToml).toContain('custom-protocol = ["tauri/custom-protocol"]');
|
||||||
expect(appBuildScript).toContain("CARGO_FEATURE_CUSTOM_PROTOCOL");
|
expect(appBuildScript).toContain("CARGO_FEATURE_CUSTOM_PROTOCOL");
|
||||||
expect(appBuildScript).toContain("CARGO_CFG_TARGET_VENDOR");
|
expect(appBuildScript).toContain("CARGO_CFG_TARGET_VENDOR");
|
||||||
expect(ciWorkflow).toContain("--release --features custom-protocol --target x86_64-win7-windows-msvc");
|
expect(ciWorkflow).toContain("build --locked --package dbx --release --features custom-protocol");
|
||||||
|
expect(ciWorkflow).toContain("--target x86_64-win7-windows-msvc --timings");
|
||||||
expect(releaseWorkflow).toContain("--release --features custom-protocol --target x86_64-win7-windows-msvc");
|
expect(releaseWorkflow).toContain("--release --features custom-protocol --target x86_64-win7-windows-msvc");
|
||||||
expect(ciWorkflow).toContain("TAURI_CONFIG = Get-Content src-tauri/tauri.webview2-win7-fixed.conf.json -Raw");
|
expect(ciWorkflow).toContain("TAURI_CONFIG = Get-Content src-tauri/tauri.webview2-win7-fixed.conf.json -Raw");
|
||||||
expect(releaseWorkflow).toContain("TAURI_CONFIG = Get-Content src-tauri/tauri.webview2-win7-fixed.conf.json -Raw");
|
expect(releaseWorkflow).toContain("TAURI_CONFIG = Get-Content src-tauri/tauri.webview2-win7-fixed.conf.json -Raw");
|
||||||
|
|||||||
Reference in new issue
Block a user