fix(release): restore clean publish path (#89)

* fix(tools): verify cargo-binstall with pinned flag (#87)

* fix(release): resume tagged publish runs

* fix(release): seed swift package release

Author: f0rr0

.github/scripts/check-release-intent.sh

@@ -87,6 +87,25 @@ for (const [path, version] of Object.entries(data).sort(([left], [right]) => lef
 '
 }
 
+allowed_bootstrap_release_manifest_seed() {
+  local change="${1:?allowed_bootstrap_release_manifest_seed requires a change row}"
+  [[ "${change}" == "src/sdks/swift=0.0.0 -> 0.5.0" ]]
+}
+
+filter_release_manifest_changes() {
+  local mode="${1:?filter_release_manifest_changes requires allow or deny}"
+  local change
+  while IFS= read -r change; do
+    [[ -z "${change}" ]] && continue
+    if allowed_bootstrap_release_manifest_seed "${change}"; then
+      [[ "${mode}" == "allow" ]] && printf '%s\n' "${change}"
+    else
+      [[ "${mode}" == "deny" ]] && printf '%s\n' "${change}"
+    fi
+  done
+  return 0
+}
+
 base_release_manifest_versions="$(release_manifest_versions_from_ref "${base_ref}")"
 head_release_manifest_versions="$(release_manifest_versions_from_ref "${head_ref}")"
 
@@ -111,8 +130,14 @@ if [[ -n "${base_release_manifest_versions}" ]]; then
 else
   changed_existing_release_manifest_versions=""
 fi
+allowed_bootstrap_release_manifest_versions="$(
+  filter_release_manifest_changes allow <<< "${changed_existing_release_manifest_versions}"
+)"
+disallowed_changed_existing_release_manifest_versions="$(
+  filter_release_manifest_changes deny <<< "${changed_existing_release_manifest_versions}"
+)"
 
-if [[ -n "${changed_existing_versions}${changed_existing_release_manifest_versions}" && "${is_release_pr}" != true ]]; then
+if [[ -n "${changed_existing_versions}${disallowed_changed_existing_release_manifest_versions}" && "${is_release_pr}" != true ]]; then
   cat >&2 <<EOF
 This PR changes one or more workspace package versions or release-please
 manifest versions.
@@ -144,7 +169,10 @@ Head release-please manifest versions:
 ${head_release_manifest_versions}
 
 Changed existing release-please manifest versions:
-${changed_existing_release_manifest_versions}
+${disallowed_changed_existing_release_manifest_versions}
+
+Allowed bootstrap release-please manifest seed changes:
+${allowed_bootstrap_release_manifest_versions}
 EOF
   exit 1
 fi

.github/scripts/resolve-release-head.sh

@@ -43,7 +43,7 @@ if [[ "$release_sha" != "$workflow_sha" ]]; then
   while IFS= read -r path; do
     [[ -n "$path" ]] || continue
     case "$path" in
-      .github/actions/*|.github/scripts/*|.github/workflows/*|tools/policy/*|tools/release/*|tools/xtask/*|docs/maintainers/release-setup.md)
+      .github/actions/*|.github/scripts/*|.github/workflows/*|tools/dev/*|tools/policy/*|tools/release/*|tools/xtask/*|docs/maintainers/release-setup.md)
         ;;
       *)
         disallowed+=("$path")

.github/workflows/release.yml

@@ -259,7 +259,16 @@ jobs:
       - name: Plan product releases
         id: release_plan
         run: |
-          tools/dev/bun.sh tools/release/release_plan.mjs --from-product-tags --include-current-tags --head-ref "$RELEASE_HEAD_SHA" --format github-output >> "$GITHUB_OUTPUT"
+          release_plan_args=(
+            --from-product-tags
+            --include-current-tags
+            --head-ref "$RELEASE_HEAD_SHA"
+            --format github-output
+          )
+          if [[ "${{ inputs.operation }}" == "publish" ]]; then
+            release_plan_args+=(--include-current-version-tags)
+          fi
+          tools/dev/bun.sh tools/release/release_plan.mjs "${release_plan_args[@]}" >> "$GITHUB_OUTPUT"
 
       - name: No package release planned
         if: ${{ steps.release_plan.outputs.has_release_changes != 'true' }}

.release-please-manifest.json

@@ -3,7 +3,7 @@
   "src/sdks/rust": "0.0.0",
   "src/runtimes/broker": "0.0.0",
   "src/runtimes/node-direct": "0.0.0",
-  "src/sdks/swift": "0.0.0",
+  "src/sdks/swift": "0.5.0",
   "src/sdks/kotlin": "0.0.0",
   "src/sdks/react-native": "0.0.0",
   "src/sdks/js": "0.0.0",

docs/maintainers/release-setup.md

@@ -89,19 +89,24 @@ tools/dev/bun.sh tools/release/release-check.mjs
 ```
 
 For normal releases, leave the `Release` workflow's `release_commit` input
-empty. If a publish or dry-run fails and a later `main` commit only fixes
-release tooling, rerun `Release` from current `main` with `release_commit` set
-to the full 40-character SHA that should be published. The workflow still runs
-the latest release scripts, but it plans the release, selects CI artifacts,
-checks product tags, and verifies publication against that selected release
-commit. During `publish`, the workflow creates a temporary release-please target
-branch at the selected commit so product tags and GitHub releases point at the
-published source commit, then removes that temporary branch.
+empty. If release-please has already created product tags but a later publish
+step failed, rerun `Release` from current `main`; `publish` keeps selecting the
+current-version product tags so the idempotent publish steps can complete
+missing assets and registry outputs. If a publish or dry-run fails and a later
+`main` commit only fixes release tooling, rerun `Release` from current `main`
+with `release_commit` set to the full 40-character SHA that should be
+published. The workflow still runs the latest release scripts, but it plans the
+release, selects CI artifacts, checks product tags, and verifies publication
+against that selected release commit. During `publish`, the workflow creates a
+temporary release-please target branch at the selected commit so product tags
+and GitHub releases point at the published source commit, then removes that
+temporary branch.
 
 Do not use `release_commit` to skip CI for product source, version, changelog,
 or release metadata changes. The workflow rejects lagging release commits unless
 the intervening files are release tooling such as `.github/workflows/`,
-`.github/scripts/`, `tools/release/`, `tools/policy/`, or `tools/xtask/`.
+`.github/scripts/`, `tools/dev/`, `tools/release/`, `tools/policy/`, or
+`tools/xtask/`.
 
 ## crates.io
 
@@ -325,6 +330,9 @@ Setup:
    the repository. The release workflow creates two tags:
    - `oliphaunt-swift-v<version>` for the product release identity.
    - `<version>` for SwiftPM package resolution.
+   Legacy pglite releases already use unscoped `0.1.0` through `0.5.1` tags, so
+   the first Oliphaunt Swift release is bootstrapped from a `0.5.0` release-please
+   baseline and minor-bumped by the introductory feature commits to `0.6.0`.
 3. Publish the compatible `liboliphaunt-native-v<version>` GitHub release assets
    before or during the same release plan. The Swift SDK pins that native core
    version in `src/sdks/swift/LIBOLIPHAUNT_VERSION`.

docs/maintainers/release.md

@@ -101,20 +101,24 @@ from release-affecting commits since its own latest product tag.
 Product tags are scoped by product:
 
 - `liboliphaunt-native-v0.1.0`
-- `liboliphaunt-wasix-v0.5.1`
+- `liboliphaunt-wasix-v0.1.0`
 - `oliphaunt-rust-v0.1.0`
 - `oliphaunt-broker-v0.1.0`
 - `oliphaunt-node-direct-v0.1.0`
-- `oliphaunt-swift-v0.1.0`
+- `oliphaunt-swift-v0.6.0`
 - `oliphaunt-kotlin-v0.1.0`
 - `oliphaunt-react-native-v0.1.0`
 - `oliphaunt-js-v0.1.0`
-- `oliphaunt-wasix-rust-v0.5.1`
+- `oliphaunt-wasix-rust-v0.1.0`
 - `oliphaunt-extension-vector-v0.1.0`
 
 The WASIX Rust crate can read legacy unscoped tags for migration history, but
 new product identity uses product-scoped tags.
 
+SwiftPM also needs an unscoped semver tag. Legacy pglite releases already own
+`0.1.0` through `0.5.1`, so the first Oliphaunt Swift release starts at
+`0.6.0` while its product identity remains `oliphaunt-swift-v0.6.0`.
+
 ## Native Artifacts
 
 Native runtime artifacts are release assets consumed by SDK tooling. The active

release-please-config.json

@@ -210,6 +210,7 @@
       "release-type": "simple",
       "component": "oliphaunt-swift",
       "package-name": "oliphaunt-swift",
+      "bump-patch-for-minor-pre-major": false,
       "version-file": "VERSION",
       "changelog-path": "CHANGELOG.md"
     },

src/sdks/react-native/package.json

@@ -21,7 +21,7 @@
   "types": "lib/typescript/index.d.ts",
   "react-native": "lib/module/index.js",
   "oliphaunt": {
-    "swiftSdkVersion": "0.0.0",
+    "swiftSdkVersion": "0.5.0",
     "kotlinSdkVersion": "0.0.0"
   },
   "files": [

src/sdks/swift/VERSION

@@ -1 +1 @@
-0.0.0
+0.5.0

tools/dev/bootstrap-tools.sh

@@ -27,6 +27,7 @@ has_command() {
 installed_tool_version() {
   binary="$1"
   case "$(basename "$binary")" in
+    cargo-binstall) "$binary" -V 2>/dev/null || true ;;
     cargo-hack) PATH="$(dirname "$binary"):$PATH" cargo hack --version 2>/dev/null || true ;;
     cargo-semver-checks) PATH="$(dirname "$binary"):$PATH" cargo semver-checks --version 2>/dev/null || true ;;
     *) "$binary" --version 2>/dev/null || true ;;
@@ -102,7 +103,7 @@ install_cargo_tool() {
 install_cargo_binstall() {
   local_binary="$cargo_bin_dir/cargo-binstall"
   if [ -x "$local_binary" ]; then
-    output="$("$local_binary" -V 2>/dev/null || true)"
+    output="$(installed_tool_version "$local_binary")"
     if version_output_matches "$output" "$CARGO_BINSTALL_VERSION"; then
       echo "cargo-binstall already installed: $output"
       return
@@ -156,7 +157,7 @@ install_cargo_binstall() {
   fi
   install "$binstall_bin" "$local_binary"
   rm -rf "$tmp"
-  output="$("$local_binary" -V 2>/dev/null || true)"
+  output="$(installed_tool_version "$local_binary")"
   require_pinned_version cargo-binstall "$CARGO_BINSTALL_VERSION" "$output"
 }