@zackees/soldr 0.9.21 → 0.9.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +13 -12
- package/package.json +1 -1
- package/scripts/install.js +8 -9
- package/scripts/test-npm-package.js +22 -13
package/README.md
CHANGED
|
@@ -76,7 +76,7 @@ every later build on any branch or worktree hits the shared cache.
|
|
|
76
76
|
| `soldr build --target <triple\|alias>` | Blessed cross-compile with a managed SDK (`win-x64`, `mac-arm64`, `linux-x64-musl`, ...) |
|
|
77
77
|
| `soldr cc` / `soldr c++` | Compile C / C++ with a catalogue-backed toolchain |
|
|
78
78
|
| `soldr lint` | Unified Rust and dependency lint suites |
|
|
79
|
-
| `soldr ci-test` | **The supported way to test soldr-built projects.** The prescribed
|
|
79
|
+
| `soldr ci-test` | **The supported way to test soldr-built projects.** The prescribed validation DAG used in CI — see [Testing strategy](#testing-strategy) |
|
|
80
80
|
| `soldr <tool>` | Fetch and run a pre-built ecosystem tool: `nextest`, `deny`, `audit`, `mdbook`, `just`, ... |
|
|
81
81
|
|
|
82
82
|
### Testing strategy
|
|
@@ -89,21 +89,23 @@ Hand-rolled sequences of `cargo fmt` + `cargo clippy` + `cargo nextest` + doctes
|
|
|
89
89
|
recompile the same crates several times over and drift apart from what CI runs.
|
|
90
90
|
|
|
91
91
|
```bash
|
|
92
|
-
soldr ci-test # the
|
|
92
|
+
soldr ci-test # build and run the host-validation DAG
|
|
93
93
|
soldr ci-test --explain-plan --format json # inspect the plan, no compiler work
|
|
94
94
|
soldr ci-test --package soldr-core # host-scope narrowing
|
|
95
|
+
soldr ci-test --no-run --target mac-arm64 # compile and archive a foreign target
|
|
95
96
|
```
|
|
96
97
|
|
|
97
|
-
**Know the
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
98
|
+
**Know the execution boundary.** `ci-test --target <triple>` runs tests by
|
|
99
|
+
default for the exact host triple. A foreign target without a registered
|
|
100
|
+
executor fails with guidance to pass `--no-run`; it never reports a green
|
|
101
|
+
build-only result as a test pass. `--no-run` runs the compile-side checks and
|
|
102
|
+
writes a Nextest archive at the printed path (also in the JSON plan). Replay
|
|
103
|
+
that archive on the target:
|
|
102
104
|
|
|
103
105
|
```bash
|
|
104
|
-
soldr
|
|
106
|
+
soldr ci-test --no-run --target <triple>
|
|
105
107
|
# then, on (or emulating) the target:
|
|
106
|
-
cargo-nextest nextest run --archive-file
|
|
108
|
+
cargo-nextest nextest run --archive-file <printed-path> --workspace-remap <checkout>
|
|
107
109
|
```
|
|
108
110
|
|
|
109
111
|
Two things bite consumers here, both observed rather than hypothesised:
|
|
@@ -115,8 +117,7 @@ Two things bite consumers here, both observed rather than hypothesised:
|
|
|
115
117
|
workspace root. Without it: `error: workspace root manifest at ... does not
|
|
116
118
|
exist`. `--workspace-remap` must point at a real checkout.
|
|
117
119
|
|
|
118
|
-
|
|
119
|
-
in soldr#3084.
|
|
120
|
+
Automatic foreign-target executors are tracked in soldr#3294.
|
|
120
121
|
|
|
121
122
|
And a caution soldr learned the hard way (soldr#2945): **a green CI lane only
|
|
122
123
|
proves the verb CI runs.** When a tool has more than one entry point, check that
|
|
@@ -230,7 +231,7 @@ Two equivalent ways to declare a cross target: declaratively via `rust-toolchain
|
|
|
230
231
|
```toml
|
|
231
232
|
# rust-toolchain.toml — declarative (preferred)
|
|
232
233
|
[toolchain]
|
|
233
|
-
channel = "1.
|
|
234
|
+
channel = "1.98.1"
|
|
234
235
|
targets = ["aarch64-pc-windows-msvc"]
|
|
235
236
|
```
|
|
236
237
|
|
package/package.json
CHANGED
package/scripts/install.js
CHANGED
|
@@ -43,16 +43,15 @@ const BUNDLED_BINARIES = zccacheContract.RELEASE_BUNDLED_BINARIES;
|
|
|
43
43
|
// The lowest glibc a host must have before the `-gnu` artifact is worth
|
|
44
44
|
// downloading (soldr#1060).
|
|
45
45
|
//
|
|
46
|
-
//
|
|
47
|
-
//
|
|
48
|
-
//
|
|
49
|
-
//
|
|
50
|
-
//
|
|
51
|
-
//
|
|
46
|
+
// This tracks release-auto.yml's BUNDLED-ARCHIVE glibc ceiling
|
|
47
|
+
// (`verify_release_bundle.py --check glibc-baseline`), because the installer
|
|
48
|
+
// downloads the whole archive. soldr's own binaries reach glibc 2.17 through
|
|
49
|
+
// the managed sysroot (soldr#1060, verified in manylinux2014), but the
|
|
50
|
+
// archive also ships prebuilt `crgx` and `cargo-chef` from soldr-toolchain,
|
|
51
|
+
// which measure GLIBC_2.39. Until those are rebuilt against 2.17, a host
|
|
52
|
+
// below 2.39 must get the musl archive, whose tools all run.
|
|
52
53
|
//
|
|
53
|
-
// Kept in lockstep with
|
|
54
|
-
// check in test-npm-package.js. When the release build is fixed to link
|
|
55
|
-
// against a 2.17 baseline that ceiling drops, and this must follow it down.
|
|
54
|
+
// Kept in lockstep with that ceiling by a check in test-npm-package.js.
|
|
56
55
|
const MIN_GLIBC_FOR_GNU = "2.39";
|
|
57
56
|
|
|
58
57
|
function compareVersions(left, right) {
|
|
@@ -231,12 +231,15 @@ assert.strictEqual(
|
|
|
231
231
|
);
|
|
232
232
|
|
|
233
233
|
// 2. A glibc that is too old must NOT take the gnu build. This is the live
|
|
234
|
-
// bug:
|
|
235
|
-
//
|
|
236
|
-
//
|
|
234
|
+
// bug soldr#1060 exists to prevent: a host whose glibc is below what the
|
|
235
|
+
// published gnu binary actually requires must not be sent to it, or it
|
|
236
|
+
// dies with "version `GLIBC_2.xx' not found" while the musl artifact
|
|
237
|
+
// from the same release runs fine. RHEL 7 / CentOS 7 (glibc 2.17,
|
|
238
|
+
// exactly the shipped floor) is the boundary case; one below it is
|
|
239
|
+
// unambiguously too old regardless of where the floor currently sits.
|
|
237
240
|
assert.strictEqual(
|
|
238
241
|
install.detectLibc("linux", {
|
|
239
|
-
readHeader: () => ({ glibcVersionRuntime: "2.
|
|
242
|
+
readHeader: () => ({ glibcVersionRuntime: "2.12" }),
|
|
240
243
|
listLib: () => ["ld-linux-x86-64.so.2", "libc.so.6"],
|
|
241
244
|
}),
|
|
242
245
|
"musl",
|
|
@@ -357,9 +360,9 @@ assert.strictEqual(
|
|
|
357
360
|
}
|
|
358
361
|
|
|
359
362
|
// MIN_GLIBC_FOR_GNU must track the ceiling release-auto.yml enforces on the
|
|
360
|
-
// gnu
|
|
361
|
-
//
|
|
362
|
-
//
|
|
363
|
+
// gnu ARCHIVE (see the lockstep assertion below). When that ceiling drops,
|
|
364
|
+
// the installer must follow it down -- otherwise glibc hosts keep being sent
|
|
365
|
+
// to musl long after gnu would work -- and it must never go below it.
|
|
363
366
|
//
|
|
364
367
|
// Anchored on the script name rather than on any `--max-glibc`. release-auto
|
|
365
368
|
// now passes that flag twice: 2.39 to verify_glibc_baseline.py for the
|
|
@@ -448,17 +451,23 @@ const releaseWorkflow = fs.readFileSync(
|
|
|
448
451
|
path.join(root, ".github", "workflows", "release-auto.yml"),
|
|
449
452
|
"utf8",
|
|
450
453
|
);
|
|
451
|
-
|
|
454
|
+
// The installer downloads the whole -gnu ARCHIVE, not just soldr's own
|
|
455
|
+
// binary, so its floor must be the ceiling release-auto.yml enforces on the
|
|
456
|
+
// bundle (`verify_release_bundle.py --check glibc-baseline`), which also
|
|
457
|
+
// covers the prebuilt `crgx` / `cargo-chef` fetched from soldr-toolchain.
|
|
458
|
+
// Tracking the own-binary ceiling instead (2.17 since soldr#1060) would send
|
|
459
|
+
// glibc 2.17-2.38 hosts an archive whose bundled tools need 2.39.
|
|
460
|
+
const bundleCeiling = glibcCeilingFor(releaseWorkflow, "--check glibc-baseline");
|
|
452
461
|
assert(
|
|
453
|
-
|
|
454
|
-
"release-auto.yml must pass --max-glibc to
|
|
462
|
+
bundleCeiling,
|
|
463
|
+
"release-auto.yml must pass --max-glibc to the bundled glibc-baseline check",
|
|
455
464
|
);
|
|
456
465
|
assert.strictEqual(
|
|
457
466
|
install.MIN_GLIBC_FOR_GNU,
|
|
458
|
-
|
|
467
|
+
bundleCeiling,
|
|
459
468
|
`install.js MIN_GLIBC_FOR_GNU (${install.MIN_GLIBC_FOR_GNU}) must match the ` +
|
|
460
|
-
`--max-glibc ceiling
|
|
461
|
-
`(${
|
|
469
|
+
`--max-glibc ceiling release-auto.yml enforces on the bundled -gnu archive ` +
|
|
470
|
+
`(${bundleCeiling})`,
|
|
462
471
|
);
|
|
463
472
|
|
|
464
473
|
assert.strictEqual(
|