@futurelastic/colab-handbook 1.14.1-rc.7 → 1.14.1-rc.8
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/package.json +1 -1
- package/tools/colab +2 -1
- package/tools/lib/release-tag.js +8 -3
package/package.json
CHANGED
package/tools/colab
CHANGED
|
@@ -1311,7 +1311,8 @@ Refuses, naming each failed condition (all are reported, not just the first):
|
|
|
1311
1311
|
judgement on the diff
|
|
1312
1312
|
switch-dependencies a colab:switch marker is malformed, or a finished switch needs one that is not
|
|
1313
1313
|
manifest-version the tag does not equal the version a manifest declares (VERSION, package.json,
|
|
1314
|
-
Cargo.toml [package],
|
|
1314
|
+
Cargo.toml [package], else [workspace.package] (#620), pyproject.toml
|
|
1315
|
+
[project]/[tool.poetry]) — none declared
|
|
1315
1316
|
passes: the tag is the version (#424). Under release.version-source: tag (#438;
|
|
1316
1317
|
the default where the machine cuts the tag, #484) a differing manifest is DERIVABLE — skipped, named in the tag message, and
|
|
1317
1318
|
stamped from the tag by the repo's own release step (never on trunk)
|
package/tools/lib/release-tag.js
CHANGED
|
@@ -176,10 +176,15 @@ function manifestVersions(readFile) {
|
|
|
176
176
|
if (j && typeof j.version === 'string') out.push({ file, version: j.version });
|
|
177
177
|
else if (j && j.version !== undefined) out.push({ file, error: `package.json version is ${JSON.stringify(j.version)}, not a string` });
|
|
178
178
|
} else if (file === 'Cargo.toml') {
|
|
179
|
+
// #620: a workspace root states the shared version in [workspace.package] — the form Cargo
|
|
180
|
+
// documents — and may have no [package] at all, or one that inherits it with
|
|
181
|
+
// version.workspace = true. Either way that is the version this repo releases. A literal
|
|
182
|
+
// [package] version still wins: [workspace.package] is only what members inherit.
|
|
179
183
|
const v = tomlTableVersion(text, 'package');
|
|
180
|
-
if (!v) continue;
|
|
181
|
-
|
|
182
|
-
|
|
184
|
+
if (v && !v.workspace) { if (v.value !== undefined) out.push({ file, version: v.value }); continue; }
|
|
185
|
+
const ws = tomlTableVersion(text, 'workspace.package');
|
|
186
|
+
if (ws && ws.value !== undefined) out.push({ file, version: ws.value });
|
|
187
|
+
else if (v && v.workspace) out.push({ file, error: 'Cargo.toml takes version.workspace = true but declares no [workspace.package] version — this is a member crate, and its workspace root is not read here' });
|
|
183
188
|
} else if (file === 'pyproject.toml') {
|
|
184
189
|
const v = tomlTableVersion(text, 'project') || tomlTableVersion(text, 'tool.poetry');
|
|
185
190
|
if (!v) continue;
|