Skip to content

Turn any idea, plan, or codebase into a beautiful interactive diagram. An agent skill for Claude Code, Codex, and more.

Merge upstream main and resolve workflow pinning conflicts

Sima Bagherie0c652569713
diff --cc .github/workflows/ci.yml
index a00120a8,8d912c16..2f68e4a2
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@@ -85,6 -85,61 +85,61 @@@ jobs
exit 1
fi
+ published-update-manifest:
+ runs-on: ubuntu-latest
+ steps:
- - uses: actions/checkout@v4
- - uses: actions/setup-node@v4
++ - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
++ - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+ with:
+ node-version: 22
+ - name: Public notifier manifest must reference an existing stable Release
+ env:
+ GH_TOKEN: ${{ github.token }}
+ run: |
+ set -euo pipefail
+ manifest_version="$(node --input-type=module -e 'import fs from "node:fs"; import { validateStableUpdateManifest } from "./archify/scripts/update-contract.mjs"; process.stdout.write(validateStableUpdateManifest(JSON.parse(fs.readFileSync("./docs/skill-updates/archify/stable.json", "utf8"))).version);')"
+ latest_stable_tag="$(gh api "repos/${GITHUB_REPOSITORY}/releases/latest" --jq 'select(.draft == false and .prerelease == false) | .tag_name')"
+ if [[ "$latest_stable_tag" != "v${manifest_version}" ]]; then
+ echo "::error::stable.json v${manifest_version} must match the latest published stable Release ${latest_stable_tag:-'(missing)'}"
+ exit 1
+ fi
+ release_asset_id="$(gh api "repos/${GITHUB_REPOSITORY}/releases/tags/v${manifest_version}" --jq 'select(.draft == false and .prerelease == false) | .assets[] | select(.name == "archify.zip") | .id')"
+ if [[ -z "$release_asset_id" ]]; then
+ echo "::error::v${manifest_version} must have a published stable GitHub Release with an archify.zip asset before stable.json is merged"
+ exit 1
+ fi
+ published_archive="$RUNNER_TEMP/archify-v${manifest_version}.zip"
+ gh api "repos/${GITHUB_REPOSITORY}/releases/assets/${release_asset_id}" \
+ -H 'Accept: application/octet-stream' > "$published_archive"
+ git fetch --force --no-tags --depth=1 origin \
+ "refs/tags/v${manifest_version}:refs/tags/v${manifest_version}"
+ tagged_archive="$RUNNER_TEMP/archify-tag-v${manifest_version}.zip"
+ git show "v${manifest_version}:archify.zip" > "$tagged_archive"
+ if ! cmp -s "$published_archive" "$tagged_archive"; then
+ echo "::error::the published archify.zip asset must byte-match archify.zip committed at v${manifest_version}"
+ exit 1
+ fi
+ node scripts/check-stable-update-manifest.mjs \
+ --archive "$published_archive" \
+ --tag "v${manifest_version}" \
+ --source-ref "v${manifest_version}"
+ if git cat-file -e "v${manifest_version}:scripts/stage-clean-skill.mjs" 2>/dev/null \
+ && git cat-file -e "v${manifest_version}:scripts/write-deterministic-zip.mjs" 2>/dev/null; then
+ tag_checkout="$RUNNER_TEMP/archify-tag-v${manifest_version}"
+ rebuilt_archive="$RUNNER_TEMP/archify-rebuilt-v${manifest_version}.zip"
+ git worktree add --detach "$tag_checkout" "v${manifest_version}"
+ "$tag_checkout/scripts/build-zip.sh" "$rebuilt_archive"
+ if ! cmp -s "$rebuilt_archive" "$tagged_archive"; then
+ echo "::error::archify.zip committed at v${manifest_version} is not the deterministic build of that tag"
+ exit 1
+ fi
+ elif [[ "$manifest_version" == "2.15.0" ]]; then
+ echo "::notice::v2.15.0 predates the deterministic builder; its published asset is bound to the exact tagged archive blob"
+ else
+ echo "::error::v${manifest_version} is missing the deterministic archive builder"
+ exit 1
+ fi
+
package-smoke:
name: package smoke (${{ matrix.os }})
strategy:
@@@ -114,3 -169,44 +169,44 @@@
Expand-Archive -Path archify.zip -DestinationPath $packageRoot
- name: Validate packaged skill without installing dependencies
run: node scripts/package-smoke.mjs
+
+ deploy-pages:
+ if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+ needs: [test, webm-artifact, zip-freshness, published-update-manifest, package-smoke]
+ runs-on: ubuntu-latest
+ concurrency:
+ group: github-pages
+ cancel-in-progress: false
+ permissions:
+ contents: read
+ pages: write
+ id-token: write
+ environment:
+ name: github-pages
+ url: ${{ steps.deployment.outputs.page_url }}
+ steps:
- - uses: actions/checkout@v4
++ - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
+ - name: Reject an obsolete deployment run
+ id: deployment-head
+ env:
+ GH_TOKEN: ${{ github.token }}
+ run: |
+ current_main="$(gh api "repos/${GITHUB_REPOSITORY}/git/ref/heads/main" --jq '.object.sha')"
+ if [[ "$current_main" == "$GITHUB_SHA" ]]; then
+ echo 'current=true' >> "$GITHUB_OUTPUT"
+ else
+ echo 'current=false' >> "$GITHUB_OUTPUT"
+ echo "::notice::Skipping obsolete Pages deployment for ${GITHUB_SHA}; main is ${current_main}"
+ fi
+ - name: Configure GitHub Pages
+ if: steps.deployment-head.outputs.current == 'true'
- uses: actions/configure-pages@v5
++ uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5.0.0
+ - name: Upload checked documentation
+ if: steps.deployment-head.outputs.current == 'true'
- uses: actions/upload-pages-artifact@v4
++ uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4.0.0
+ with:
+ path: docs
+ - name: Deploy checked documentation
+ if: steps.deployment-head.outputs.current == 'true'
+ id: deployment
- uses: actions/deploy-pages@v4
++ uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4.0.5
diff --cc .github/workflows/release.yml
index 52737164,4c476889..20b39001
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@@ -11,8 -11,11 +11,11 @@@ jobs
release:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v4
+ - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
+ - name: Fetch exact tag object
+ shell: bash
+ run: git fetch --force --no-tags origin "+refs/tags/${GITHUB_REF_NAME}:refs/tags/${GITHUB_REF_NAME}"
- - uses: actions/setup-node@v4
+ - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
with:
node-version: 22
cache: npm