Squashed 'docs/standards/playbook/' changes from 8b75747..c3f8137
c3f8137 📦 deps(skills): sync superpowers 35e827d 📦 deps(skills): sync superpowers e546ffb 📦 deps(skills): sync superpowers f7f2c57 🔧 chore(ci): use ci-bot identity for superpowers sync commits fa247a7 📦 deps(skills): sync superpowers a97c333 🔧 chore(ci): add resilient upstream fetch fallback for superpowers update 484f9d3 🔧 chore(ci): automate thirdparty superpowers refresh and sync base c19e53e 📝 docs(playbook): refresh guidance and examples 52046b4 📝 docs(prompts): add code-review template and align docs flow 9ac8a4c 📝 docs(typescript): clarify ts and js support boundaries 1f46203 ✨ feat(typescript): add standards docs and sync rewrite coverage 872c1af 🔧 feat(skills): install to agents home git-subtree-dir: docs/standards/playbook git-subtree-split: c3f81371e24d63b603de9b6eb92bf7e4c453a2b4
This commit is contained in:
@@ -6,8 +6,8 @@ SUPERPOWERS_BRANCH="${SUPERPOWERS_BRANCH:-thirdparty/skill}"
|
||||
SUPERPOWERS_DIR="${SUPERPOWERS_DIR:-superpowers}"
|
||||
SUPERPOWERS_LIST="${SUPERPOWERS_LIST:-codex/skills/.sources/superpowers.list}"
|
||||
TARGET_BRANCH="${TARGET_BRANCH:-main}"
|
||||
COMMIT_AUTHOR_NAME="${COMMIT_AUTHOR_NAME:-playbook-bot}"
|
||||
COMMIT_AUTHOR_EMAIL="${COMMIT_AUTHOR_EMAIL:-playbook-bot@local}"
|
||||
COMMIT_AUTHOR_NAME="${COMMIT_AUTHOR_NAME:-ci-bot}"
|
||||
COMMIT_AUTHOR_EMAIL="${COMMIT_AUTHOR_EMAIL:-ci-bot@local}"
|
||||
|
||||
cd "$REPO_DIR"
|
||||
|
||||
|
||||
@@ -0,0 +1,159 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
REPO_DIR="${REPO_DIR:-$(pwd)}"
|
||||
TARGET_BRANCH="${TARGET_BRANCH:-thirdparty/skill}"
|
||||
SNAPSHOT_DIR="${SNAPSHOT_DIR:-superpowers}"
|
||||
SOURCE_FILE="${SOURCE_FILE:-${SNAPSHOT_DIR}/SOURCE.md}"
|
||||
UPSTREAM_REPO="${UPSTREAM_REPO:-https://github.com/obra/superpowers.git}"
|
||||
UPSTREAM_REF="${UPSTREAM_REF:-main}"
|
||||
COMMIT_AUTHOR_NAME="${COMMIT_AUTHOR_NAME:-ci-bot}"
|
||||
COMMIT_AUTHOR_EMAIL="${COMMIT_AUTHOR_EMAIL:-ci-bot@local}"
|
||||
|
||||
retry_cmd() {
|
||||
local retries="$1"
|
||||
shift
|
||||
local delay="$1"
|
||||
shift
|
||||
|
||||
local attempt=1
|
||||
while true; do
|
||||
if "$@"; then
|
||||
return 0
|
||||
fi
|
||||
if [ "$attempt" -ge "$retries" ]; then
|
||||
return 1
|
||||
fi
|
||||
echo "Retry ($attempt/$retries): $*" >&2
|
||||
sleep "$delay"
|
||||
attempt=$((attempt + 1))
|
||||
done
|
||||
}
|
||||
|
||||
github_owner_repo() {
|
||||
case "$1" in
|
||||
https://github.com/*)
|
||||
echo "$1" | sed -E 's#^https://github.com/([^/]+/[^/.]+)(\.git)?$#\1#'
|
||||
;;
|
||||
http://github.com/*)
|
||||
echo "$1" | sed -E 's#^http://github.com/([^/]+/[^/.]+)(\.git)?$#\1#'
|
||||
;;
|
||||
git@github.com:*)
|
||||
echo "$1" | sed -E 's#^git@github.com:([^/]+/[^/.]+)(\.git)?$#\1#'
|
||||
;;
|
||||
*)
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
resolve_latest_sha() {
|
||||
local repo="$1"
|
||||
local ref="$2"
|
||||
local tmp_json="$3"
|
||||
local gh_repo="$4"
|
||||
local sha=""
|
||||
|
||||
# Prefer GitHub API when possible to avoid git+gnutls handshake failures.
|
||||
if [ -n "$gh_repo" ]; then
|
||||
local api_url="https://api.github.com/repos/${gh_repo}/commits/${ref}"
|
||||
if retry_cmd 3 2 curl -fsSL --retry 3 --retry-delay 2 "$api_url" -o "$tmp_json"; then
|
||||
sha="$(sed -n 's/^[[:space:]]*"sha":[[:space:]]*"\([0-9a-f]\{40\}\)".*/\1/p' "$tmp_json" | head -n 1)"
|
||||
if [ -n "$sha" ]; then
|
||||
echo "$sha"
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Fallback to git transport.
|
||||
sha="$(retry_cmd 3 2 git -c http.version=HTTP/1.1 ls-remote "$repo" "refs/heads/$ref" | awk 'NR==1 {print $1}')"
|
||||
if [ -n "$sha" ]; then
|
||||
echo "$sha"
|
||||
return 0
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
cd "$REPO_DIR"
|
||||
|
||||
git config user.name "$COMMIT_AUTHOR_NAME"
|
||||
git config user.email "$COMMIT_AUTHOR_EMAIL"
|
||||
|
||||
git fetch origin "$TARGET_BRANCH"
|
||||
git checkout -B "$TARGET_BRANCH" "origin/$TARGET_BRANCH"
|
||||
|
||||
tmp_dir="$(mktemp -d)"
|
||||
cleanup() {
|
||||
rm -rf "$tmp_dir"
|
||||
}
|
||||
trap cleanup EXIT
|
||||
|
||||
gh_repo=""
|
||||
if gh_repo="$(github_owner_repo "$UPSTREAM_REPO" 2>/dev/null)"; then
|
||||
:
|
||||
fi
|
||||
|
||||
latest_sha="$(resolve_latest_sha "$UPSTREAM_REPO" "$UPSTREAM_REF" "$tmp_dir/latest.json" "$gh_repo" || true)"
|
||||
if [ -z "$latest_sha" ]; then
|
||||
echo "ERROR: failed to resolve upstream ref: $UPSTREAM_REPO $UPSTREAM_REF" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
current_sha=""
|
||||
if [ -f "$SOURCE_FILE" ]; then
|
||||
current_sha="$(sed -n 's/^- Ref:[[:space:]]*//p' "$SOURCE_FILE" | head -n 1)"
|
||||
fi
|
||||
|
||||
if [ "$latest_sha" = "$current_sha" ]; then
|
||||
echo "Third-party snapshot is up to date: $latest_sha"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
rm -rf "$SNAPSHOT_DIR"
|
||||
mkdir -p "$SNAPSHOT_DIR"
|
||||
|
||||
snapshot_loaded=0
|
||||
|
||||
if [ -n "$gh_repo" ]; then
|
||||
tar_url="https://codeload.github.com/${gh_repo}/tar.gz/${latest_sha}"
|
||||
if retry_cmd 3 2 curl -fsSL --retry 3 --retry-delay 2 "$tar_url" -o "$tmp_dir/upstream.tar.gz"; then
|
||||
tar -xzf "$tmp_dir/upstream.tar.gz" -C "$SNAPSHOT_DIR" --strip-components=1
|
||||
snapshot_loaded=1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$snapshot_loaded" -eq 0 ]; then
|
||||
upstream_dir="$tmp_dir/upstream"
|
||||
git init "$upstream_dir" >/dev/null
|
||||
git -C "$upstream_dir" remote add origin "$UPSTREAM_REPO"
|
||||
retry_cmd 3 2 git -C "$upstream_dir" fetch --depth 1 origin "$latest_sha"
|
||||
git -C "$upstream_dir" checkout --detach FETCH_HEAD
|
||||
git -C "$upstream_dir" archive --format=tar HEAD | tar -xf - -C "$SNAPSHOT_DIR"
|
||||
fi
|
||||
|
||||
snapshot_date="$(date -u +%Y-%m-%d)"
|
||||
cat > "$SOURCE_FILE" <<EOF
|
||||
# Source
|
||||
|
||||
- Repo: ${UPSTREAM_REPO%".git"}
|
||||
- Ref: $latest_sha
|
||||
- Snapshot: $snapshot_date
|
||||
- Notes: vendored into playbook branch $TARGET_BRANCH
|
||||
EOF
|
||||
|
||||
git add "$SNAPSHOT_DIR"
|
||||
|
||||
if git diff --cached --quiet; then
|
||||
echo "No changes detected after snapshot refresh."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
git commit -m ":package: deps(superpowers): vendor snapshot"
|
||||
|
||||
TOKEN="${WORKFLOW:-}"
|
||||
if [ -n "$TOKEN" ] && [ -n "${GITHUB_SERVER_URL:-}" ] && [ -n "${GITHUB_REPOSITORY:-}" ]; then
|
||||
git remote set-url origin "https://oauth2:${TOKEN}@${GITHUB_SERVER_URL#https://}/${GITHUB_REPOSITORY}.git"
|
||||
fi
|
||||
|
||||
git push origin "$TARGET_BRANCH"
|
||||
@@ -9,6 +9,7 @@ concurrency:
|
||||
|
||||
env:
|
||||
WORKSPACE_DIR: "/home/workspace"
|
||||
TARGET_BRANCH: "main"
|
||||
SUPERPOWERS_BRANCH: "thirdparty/skill"
|
||||
SUPERPOWERS_DIR: "superpowers"
|
||||
SUPERPOWERS_LIST: "codex/skills/.sources/superpowers.list"
|
||||
@@ -51,18 +52,10 @@ jobs:
|
||||
cd "$REPO_DIR"
|
||||
fi
|
||||
|
||||
TARGET_SHA="${{ github.sha }}"
|
||||
TARGET_REF="${{ github.ref }}"
|
||||
if git cat-file -e "$TARGET_SHA^{commit}" 2>/dev/null; then
|
||||
git checkout -f "$TARGET_SHA"
|
||||
else
|
||||
if [ -n "$TARGET_REF" ]; then
|
||||
git fetch origin "$TARGET_REF"
|
||||
git checkout -f FETCH_HEAD
|
||||
else
|
||||
git checkout -f "${{ github.ref_name }}"
|
||||
fi
|
||||
fi
|
||||
# Always run sync from the latest target branch state.
|
||||
# This prevents stale/manual dispatch refs from using outdated scripts.
|
||||
git fetch origin "${{ env.TARGET_BRANCH }}"
|
||||
git checkout -B "${{ env.TARGET_BRANCH }}" "origin/${{ env.TARGET_BRANCH }}"
|
||||
|
||||
git config --global --add safe.directory "$REPO_DIR"
|
||||
echo "REPO_DIR=$REPO_DIR" >> $GITHUB_ENV
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
name: Update Third-party Superpowers
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
group: thirdparty-superpowers-update-${{ github.repository }}
|
||||
cancel-in-progress: true
|
||||
|
||||
env:
|
||||
WORKSPACE_DIR: "/home/workspace"
|
||||
TARGET_BRANCH: "thirdparty/skill"
|
||||
UPSTREAM_REPO: "https://github.com/obra/superpowers.git"
|
||||
UPSTREAM_REF: "main"
|
||||
|
||||
jobs:
|
||||
update:
|
||||
name: Update thirdparty/skill snapshot
|
||||
runs-on: ubuntu-22.04
|
||||
|
||||
steps:
|
||||
- name: Prepare repo
|
||||
run: |
|
||||
echo "========================================"
|
||||
echo "Prepare repo to WORKSPACE_DIR"
|
||||
echo "========================================"
|
||||
|
||||
REPO_NAME="${{ github.event.repository.name }}"
|
||||
REPO_DIR="${{ env.WORKSPACE_DIR }}/$REPO_NAME"
|
||||
TOKEN="${{ secrets.WORKFLOW }}"
|
||||
if [ -n "$TOKEN" ]; then
|
||||
REPO_URL="https://oauth2:${TOKEN}@${GITHUB_SERVER_URL#https://}/${{ github.repository }}.git"
|
||||
else
|
||||
REPO_URL="${GITHUB_SERVER_URL}/${{ github.repository }}.git"
|
||||
fi
|
||||
|
||||
if [ -d "$REPO_DIR" ]; then
|
||||
if [ -d "$REPO_DIR/.git" ]; then
|
||||
cd "$REPO_DIR"
|
||||
git clean -fdx
|
||||
git reset --hard
|
||||
git fetch --all --tags --force --prune --prune-tags
|
||||
else
|
||||
rm -rf "$REPO_DIR"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ ! -d "$REPO_DIR/.git" ]; then
|
||||
mkdir -p "${{ env.WORKSPACE_DIR }}"
|
||||
git clone "$REPO_URL" "$REPO_DIR"
|
||||
cd "$REPO_DIR"
|
||||
fi
|
||||
|
||||
git fetch origin main
|
||||
git checkout -B main origin/main
|
||||
|
||||
git config --global --add safe.directory "$REPO_DIR"
|
||||
echo "REPO_DIR=$REPO_DIR" >> $GITHUB_ENV
|
||||
|
||||
- name: Update thirdparty/skill snapshot
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
cd "$REPO_DIR"
|
||||
bash .gitea/ci/update_thirdparty_superpowers.sh
|
||||
Reference in New Issue
Block a user