From d317825064f85931803b09d0c31315585e701388 Mon Sep 17 00:00:00 2001 From: eiei114 <60887155+eiei114@users.noreply.github.com> Date: Sat, 24 Oct 2026 02:27:30 +0900 Subject: [PATCH] fix: pack from the dispatch commit and upload only missing assets The v0.8.0 backfill failed twice over. 1. `Package (macos/x86_64)` died at the Pack step printing `('macos', 'x86_64')`. The publish dispatch checks out `inputs.tag`, so the packer came from the v0.8.0 tree, which still rejected that target. This is the same trap rbxoc hit, and rbxoc's fix was never ported here. Check the tooling out from `github.sha` into `tooling/` and run the packer from there. 2. The upload step sent `dist/*` as one batch. `gh release upload` rejects the whole batch when any single name already exists, so a backfill -- which by definition adds to a release that already has assets -- could never succeed. Filter against the release's current names and exit 0 when nothing is missing. The Upload job never ran for this dispatch because the packaging job failed, so v0.8.0 is unchanged. --- .github/workflows/release-assets.yml | 391 +++++++++++++++------------ 1 file changed, 212 insertions(+), 179 deletions(-) diff --git a/.github/workflows/release-assets.yml b/.github/workflows/release-assets.yml index d3f0fc1..be4dc79 100644 --- a/.github/workflows/release-assets.yml +++ b/.github/workflows/release-assets.yml @@ -1,179 +1,212 @@ -name: Release assets - -on: - pull_request: - workflow_dispatch: - inputs: - publish: - description: Upload archives to an existing GitHub Release - type: boolean - default: false - tag: - description: Existing tag, for example v0.7.0 - required: false - type: string - -permissions: - contents: read - -concurrency: - group: release-assets-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - package: - name: Package (${{ matrix.target_os }}/${{ matrix.arch }}) - strategy: - fail-fast: false - matrix: - include: - - os: windows-latest - target_os: windows - arch: x86_64 - binary: rob.exe - - os: ubuntu-latest - target_os: linux - arch: x86_64 - binary: rob - - os: macos-15 - target_os: macos - arch: aarch64 - binary: rob - # Standard (free) runner on public repos; no -large suffix needed. - # Emits macos-x86_64 so Rokit can serve Intel Macs, which it otherwise - # cannot detect: Rokit validates OS but not architecture. - - os: macos-15-intel - target_os: macos - arch: x86_64 - binary: rob - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v4 - with: - ref: ${{ github.event_name == 'workflow_dispatch' && inputs.publish && inputs.tag || github.sha }} - persist-credentials: false - - - name: Record the built commit - shell: bash - env: - RELEASE_TAG: ${{ inputs.tag }} - REQUIRE_TAG: ${{ github.event_name == 'workflow_dispatch' && inputs.publish }} - run: | - set -euo pipefail - sha="$(git rev-parse HEAD)" - printf '%s\n' "$sha" > built-commit.txt - if [[ "$REQUIRE_TAG" == "true" ]]; then - if [[ ! "$RELEASE_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then - echo "tag is not a plain version" >&2 - exit 1 - fi - test "$sha" = "$(git rev-parse "${RELEASE_TAG}^{commit}")" - fi - - - uses: dtolnay/rust-toolchain@stable - with: - toolchain: 1.99.0 - - - uses: actions/setup-python@v5 - with: - python-version: "3.12" - - - name: Build - run: cargo build --release --locked - - - name: Offline smoke - shell: bash - run: | - set -euo pipefail - bin="target/release/${{ matrix.binary }}" - "$bin" --version - "$bin" schema >/dev/null - "$bin" users link --user 1 >/dev/null - - - name: Pack - shell: bash - run: | - set -euo pipefail - version="$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -n 1)" - python scripts/package-release.py \ - --version "$version" \ - --os "${{ matrix.target_os }}" \ - --arch "${{ matrix.arch }}" \ - --binary "target/release/${{ matrix.binary }}" \ - --licenses . \ - --out dist - - - uses: actions/upload-artifact@v4 - with: - name: robcli-${{ matrix.target_os }}-${{ matrix.arch }} - path: dist/* - if-no-files-found: error - - - uses: actions/upload-artifact@v4 - with: - name: built-commit-${{ matrix.target_os }}-${{ matrix.arch }} - path: built-commit.txt - if-no-files-found: error - - publish: - name: Upload existing release - if: github.event_name == 'workflow_dispatch' && inputs.publish - needs: package - runs-on: ubuntu-latest - permissions: - contents: write - steps: - - uses: actions/checkout@v4 - with: - ref: ${{ inputs.tag }} - persist-credentials: false - - - name: Require the built commit to still be the tag - shell: bash - env: - RELEASE_TAG: ${{ inputs.tag }} - run: | - set -euo pipefail - if [[ ! "$RELEASE_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then - echo "tag is not a plain version" >&2 - exit 1 - fi - version="$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -n 1)" - test "$RELEASE_TAG" = "v${version}" - expected="$(git rev-parse "${RELEASE_TAG}^{commit}")" - test "$expected" = "$(git rev-parse HEAD)" - - - uses: actions/download-artifact@v4 - with: - pattern: robcli-* - path: dist - merge-multiple: true - - - uses: actions/download-artifact@v4 - with: - pattern: built-commit-* - path: commits - - - name: Reject archives built from another commit - shell: bash - env: - RELEASE_TAG: ${{ inputs.tag }} - run: | - set -euo pipefail - expected="$(git rev-parse "${RELEASE_TAG}^{commit}")" - found=0 - while IFS= read -r file; do - found=$((found + 1)) - test "$(tr -d '\r\n' < "$file")" = "$expected" - done < <(find commits -name built-commit.txt | sort) - test "$found" -eq 4 - - - name: Upload without replacing assets - env: - GH_TOKEN: ${{ github.token }} - RELEASE_TAG: ${{ inputs.tag }} - REPOSITORY: ${{ github.repository }} - run: | - set -euo pipefail - gh release view "$RELEASE_TAG" --repo "$REPOSITORY" - gh release upload "$RELEASE_TAG" dist/* --repo "$REPOSITORY" +name: Release assets + +on: + pull_request: + workflow_dispatch: + inputs: + publish: + description: Upload archives to an existing GitHub Release + type: boolean + default: false + tag: + description: Existing tag, for example v0.7.0 + required: false + type: string + +permissions: + contents: read + +concurrency: + group: release-assets-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + package: + name: Package (${{ matrix.target_os }}/${{ matrix.arch }}) + strategy: + fail-fast: false + matrix: + include: + - os: windows-latest + target_os: windows + arch: x86_64 + binary: rob.exe + - os: ubuntu-latest + target_os: linux + arch: x86_64 + binary: rob + - os: macos-15 + target_os: macos + arch: aarch64 + binary: rob + # Standard (free) runner on public repos; no -large suffix needed. + # Emits macos-x86_64 so Rokit can serve Intel Macs, which it otherwise + # cannot detect: Rokit validates OS but not architecture. + - os: macos-15-intel + target_os: macos + arch: x86_64 + binary: rob + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.event_name == 'workflow_dispatch' && inputs.publish && inputs.tag || github.sha }} + persist-credentials: false + + # A tag that predates this workflow has no scripts/package-release.py in + # its tree, so the packer is taken from the dispatch commit instead. This + # is what makes backfilling assets onto an older release possible. + - name: Check out packaging tooling + uses: actions/checkout@v4 + with: + ref: ${{ github.sha }} + path: tooling + persist-credentials: false + + - name: Record the built commit + shell: bash + env: + RELEASE_TAG: ${{ inputs.tag }} + REQUIRE_TAG: ${{ github.event_name == 'workflow_dispatch' && inputs.publish }} + run: | + set -euo pipefail + sha="$(git rev-parse HEAD)" + printf '%s\n' "$sha" > built-commit.txt + if [[ "$REQUIRE_TAG" == "true" ]]; then + if [[ ! "$RELEASE_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + echo "tag is not a plain version" >&2 + exit 1 + fi + test "$sha" = "$(git rev-parse "${RELEASE_TAG}^{commit}")" + fi + + - uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.99.0 + + - uses: actions/setup-python@v5 + with: + python-version: "3.12" + + - name: Build + run: cargo build --release --locked + + - name: Offline smoke + shell: bash + run: | + set -euo pipefail + bin="target/release/${{ matrix.binary }}" + "$bin" --version + "$bin" schema >/dev/null + "$bin" users link --user 1 >/dev/null + + - name: Pack + shell: bash + run: | + set -euo pipefail + version="$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -n 1)" + python tooling/scripts/package-release.py \ + --version "$version" \ + --os "${{ matrix.target_os }}" \ + --arch "${{ matrix.arch }}" \ + --binary "target/release/${{ matrix.binary }}" \ + --licenses . \ + --out dist + + - uses: actions/upload-artifact@v4 + with: + name: robcli-${{ matrix.target_os }}-${{ matrix.arch }} + path: dist/* + if-no-files-found: error + + - uses: actions/upload-artifact@v4 + with: + name: built-commit-${{ matrix.target_os }}-${{ matrix.arch }} + path: built-commit.txt + if-no-files-found: error + + publish: + name: Upload existing release + if: github.event_name == 'workflow_dispatch' && inputs.publish + needs: package + runs-on: ubuntu-latest + permissions: + contents: write + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ inputs.tag }} + persist-credentials: false + + - name: Require the built commit to still be the tag + shell: bash + env: + RELEASE_TAG: ${{ inputs.tag }} + run: | + set -euo pipefail + if [[ ! "$RELEASE_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + echo "tag is not a plain version" >&2 + exit 1 + fi + version="$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -n 1)" + test "$RELEASE_TAG" = "v${version}" + expected="$(git rev-parse "${RELEASE_TAG}^{commit}")" + test "$expected" = "$(git rev-parse HEAD)" + + - uses: actions/download-artifact@v4 + with: + pattern: robcli-* + path: dist + merge-multiple: true + + - uses: actions/download-artifact@v4 + with: + pattern: built-commit-* + path: commits + + - name: Reject archives built from another commit + shell: bash + env: + RELEASE_TAG: ${{ inputs.tag }} + run: | + set -euo pipefail + expected="$(git rev-parse "${RELEASE_TAG}^{commit}")" + found=0 + while IFS= read -r file; do + found=$((found + 1)) + test "$(tr -d '\r\n' < "$file")" = "$expected" + done < <(find commits -name built-commit.txt | sort) + test "$found" -eq 4 + + - name: Upload without replacing assets + env: + GH_TOKEN: ${{ github.token }} + RELEASE_TAG: ${{ inputs.tag }} + REPOSITORY: ${{ github.repository }} + run: | + set -euo pipefail + gh release view "$RELEASE_TAG" --repo "$REPOSITORY" + + # Upload only assets the release does not already have. A backfill + # exists precisely to add one new archive to a release that already + # holds the others, and `gh release upload` refuses the whole batch + # when any single name already exists. + existing="$(gh release view "$RELEASE_TAG" --repo "$REPOSITORY" --json assets --jq '.assets[].name')" + + to_upload=() + for file in dist/*; do + name="$(basename "$file")" + if grep -Fxq "$name" <<< "$existing"; then + echo "already present, skipping: $name" + else + echo "uploading: $name" + to_upload+=("$file") + fi + done + + if [ "${#to_upload[@]}" -eq 0 ]; then + echo "nothing to upload; the release already has every asset" + exit 0 + fi + + gh release upload "$RELEASE_TAG" "${to_upload[@]}" --repo "$REPOSITORY"