feat: migrate workflows to kcl-ci standard
- Add .forgejo/kcl-ci/ with kcl.mod, main.k, Taskfile.yaml - claude.yml: use claude.k module (fixes #comment YAML validation error, removes duplicate pull_request_comment trigger) - ci.yml: add paths-ignore for kcl-ci paths, named jobs for check constants - test-action.yml: regenerated from KCL (functionally identical) - upstream-sync.yml: regenerated from KCL (functionally identical) - kcl-ci-build.yml: new auto-regeneration workflow (waits for CI checks) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
1 parent
8125818e24
commit
5c014823e0
9 files changed
+821
-383
No files matched your search
+70
-87
@@ -1,118 +1,101 @@
|
||||
name: CI
|
||||
# Generated by KCL v1.34.3 - DO NOT EDIT
|
||||
# Source: .forgejo/kcl-ci/main.k
|
||||
# kcl-ci local: ~/stuff/gitrepos/wxs/actions/kcl-ci
|
||||
# kcl-ci remote: https://git.wxs.ro/actions/kcl-ci
|
||||
|
||||
on:
|
||||
name: CI
|
||||
'on':
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
- main
|
||||
paths-ignore:
|
||||
- '.forgejo/kcl-ci/**'
|
||||
pull_request:
|
||||
branches:
|
||||
- main
|
||||
workflow_dispatch:
|
||||
|
||||
- main
|
||||
paths-ignore:
|
||||
- '.forgejo/kcl-ci/**'
|
||||
workflow_dispatch: {}
|
||||
concurrency:
|
||||
group: ci-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
# Pin Bun version across all jobs. Bun 1.3.x broke spyOn(fs, ...) in tests.
|
||||
# Bump this when upstream tests are updated for newer Bun versions.
|
||||
env:
|
||||
BUN_VERSION: "1.2.21"
|
||||
|
||||
BUN_VERSION: '1.2.21'
|
||||
jobs:
|
||||
test:
|
||||
name: Tests
|
||||
runs-on: grunt
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: https://${{ secrets.READ_REPO_TOKEN }}@git.wxs.ro/xternal/checkout@v6.0.2
|
||||
with:
|
||||
fetch-depth: 1
|
||||
|
||||
- name: Install Bun
|
||||
run: |
|
||||
if command -v bun &> /dev/null; then
|
||||
INSTALLED=$(bun --version)
|
||||
if [ "$INSTALLED" = "$BUN_VERSION" ]; then
|
||||
echo "Bun $BUN_VERSION already installed"
|
||||
else
|
||||
echo "Bun $INSTALLED installed, need $BUN_VERSION — reinstalling"
|
||||
curl -fsSL https://bun.sh/install | bash -s "bun-v${BUN_VERSION}"
|
||||
echo "$HOME/.bun/bin" >> "$GITHUB_PATH"
|
||||
fi
|
||||
- name: Checkout
|
||||
uses: https://${{ secrets.READ_REPO_TOKEN }}@git.wxs.ro/xternal/checkout@v6.0.2
|
||||
- name: Install Bun
|
||||
run: |-
|
||||
if command -v bun &> /dev/null; then
|
||||
INSTALLED=$(bun --version)
|
||||
if [ "$INSTALLED" = "$BUN_VERSION" ]; then
|
||||
echo "Bun $BUN_VERSION already installed"
|
||||
else
|
||||
echo "Bun $INSTALLED installed, need $BUN_VERSION — reinstalling"
|
||||
curl -fsSL https://bun.sh/install | bash -s "bun-v${BUN_VERSION}"
|
||||
echo "$HOME/.bun/bin" >> "$GITHUB_PATH"
|
||||
fi
|
||||
|
||||
- name: Install dependencies
|
||||
run: bun install
|
||||
|
||||
- name: Run tests
|
||||
# Unit tests assume GitHub context. Override Forgejo runner's
|
||||
# GITHUB_SERVER_URL so module-level constants (config.ts) and
|
||||
# detectPlatform() default to GitHub. Forgejo-specific tests
|
||||
# explicitly set PLATFORM=forgejo in their own beforeEach.
|
||||
# Inline export because Forgejo runner re-injects GITHUB_SERVER_URL
|
||||
# after step-level env:, overriding it.
|
||||
run: |
|
||||
export GITHUB_SERVER_URL=https://github.com
|
||||
bun test
|
||||
|
||||
else
|
||||
curl -fsSL https://bun.sh/install | bash -s "bun-v${BUN_VERSION}"
|
||||
echo "$HOME/.bun/bin" >> "$GITHUB_PATH"
|
||||
fi
|
||||
- name: Install dependencies
|
||||
run: bun install
|
||||
- name: Run tests
|
||||
run: |-
|
||||
export GITHUB_SERVER_URL=https://github.com
|
||||
bun test
|
||||
prettier:
|
||||
name: Prettier
|
||||
runs-on: grunt
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: https://${{ secrets.READ_REPO_TOKEN }}@git.wxs.ro/xternal/checkout@v6.0.2
|
||||
with:
|
||||
fetch-depth: 1
|
||||
|
||||
- name: Install Bun
|
||||
run: |
|
||||
if command -v bun &> /dev/null; then
|
||||
INSTALLED=$(bun --version)
|
||||
if [ "$INSTALLED" = "$BUN_VERSION" ]; then
|
||||
echo "Bun $BUN_VERSION already installed"
|
||||
else
|
||||
echo "Bun $INSTALLED installed, need $BUN_VERSION — reinstalling"
|
||||
curl -fsSL https://bun.sh/install | bash -s "bun-v${BUN_VERSION}"
|
||||
echo "$HOME/.bun/bin" >> "$GITHUB_PATH"
|
||||
fi
|
||||
- name: Checkout
|
||||
uses: https://${{ secrets.READ_REPO_TOKEN }}@git.wxs.ro/xternal/checkout@v6.0.2
|
||||
- name: Install Bun
|
||||
run: |-
|
||||
if command -v bun &> /dev/null; then
|
||||
INSTALLED=$(bun --version)
|
||||
if [ "$INSTALLED" = "$BUN_VERSION" ]; then
|
||||
echo "Bun $BUN_VERSION already installed"
|
||||
else
|
||||
echo "Bun $INSTALLED installed, need $BUN_VERSION — reinstalling"
|
||||
curl -fsSL https://bun.sh/install | bash -s "bun-v${BUN_VERSION}"
|
||||
echo "$HOME/.bun/bin" >> "$GITHUB_PATH"
|
||||
fi
|
||||
|
||||
- name: Install dependencies
|
||||
run: bun install
|
||||
|
||||
- name: Run prettier check
|
||||
run: bun run format:check
|
||||
|
||||
else
|
||||
curl -fsSL https://bun.sh/install | bash -s "bun-v${BUN_VERSION}"
|
||||
echo "$HOME/.bun/bin" >> "$GITHUB_PATH"
|
||||
fi
|
||||
- name: Install dependencies
|
||||
run: bun install
|
||||
- name: Run prettier check
|
||||
run: bun run format:check
|
||||
typecheck:
|
||||
name: Type Check
|
||||
runs-on: grunt
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: https://${{ secrets.READ_REPO_TOKEN }}@git.wxs.ro/xternal/checkout@v6.0.2
|
||||
with:
|
||||
fetch-depth: 1
|
||||
|
||||
- name: Install Bun
|
||||
run: |
|
||||
if command -v bun &> /dev/null; then
|
||||
INSTALLED=$(bun --version)
|
||||
if [ "$INSTALLED" = "$BUN_VERSION" ]; then
|
||||
echo "Bun $BUN_VERSION already installed"
|
||||
else
|
||||
echo "Bun $INSTALLED installed, need $BUN_VERSION — reinstalling"
|
||||
curl -fsSL https://bun.sh/install | bash -s "bun-v${BUN_VERSION}"
|
||||
echo "$HOME/.bun/bin" >> "$GITHUB_PATH"
|
||||
fi
|
||||
- name: Checkout
|
||||
uses: https://${{ secrets.READ_REPO_TOKEN }}@git.wxs.ro/xternal/checkout@v6.0.2
|
||||
- name: Install Bun
|
||||
run: |-
|
||||
if command -v bun &> /dev/null; then
|
||||
INSTALLED=$(bun --version)
|
||||
if [ "$INSTALLED" = "$BUN_VERSION" ]; then
|
||||
echo "Bun $BUN_VERSION already installed"
|
||||
else
|
||||
echo "Bun $INSTALLED installed, need $BUN_VERSION — reinstalling"
|
||||
curl -fsSL https://bun.sh/install | bash -s "bun-v${BUN_VERSION}"
|
||||
echo "$HOME/.bun/bin" >> "$GITHUB_PATH"
|
||||
fi
|
||||
|
||||
- name: Install dependencies
|
||||
run: bun install
|
||||
|
||||
- name: Run TypeScript type check
|
||||
run: bun run typecheck
|
||||
else
|
||||
curl -fsSL https://bun.sh/install | bash -s "bun-v${BUN_VERSION}"
|
||||
echo "$HOME/.bun/bin" >> "$GITHUB_PATH"
|
||||
fi
|
||||
- name: Install dependencies
|
||||
run: bun install
|
||||
- name: Run TypeScript type check
|
||||
run: bun run typecheck
|
||||
@@ -1,86 +1,56 @@
|
||||
name: Claude Code (Forgejo)
|
||||
# Generated by KCL v1.34.3 - DO NOT EDIT
|
||||
# Source: .forgejo/kcl-ci/main.k
|
||||
# kcl-ci local: ~/stuff/gitrepos/wxs/actions/kcl-ci
|
||||
# kcl-ci remote: https://git.wxs.ro/actions/kcl-ci
|
||||
|
||||
on:
|
||||
name: Claude Code
|
||||
'on':
|
||||
issue_comment:
|
||||
types: [created]
|
||||
types:
|
||||
- created
|
||||
pull_request_review_comment:
|
||||
types: [created]
|
||||
types:
|
||||
- created
|
||||
issues:
|
||||
types: [opened, assigned, labeled]
|
||||
# Forgejo never fires pull_request_review — it sends pull_request_comment
|
||||
# for both review comments AND full reviews. Kept for GitHub compatibility.
|
||||
types:
|
||||
- opened
|
||||
- assigned
|
||||
- labeled
|
||||
pull_request_review:
|
||||
types: [submitted]
|
||||
|
||||
types:
|
||||
- submitted
|
||||
concurrency:
|
||||
group: claude-${{ github.event.issue.number || github.event.pull_request.number }}-${{ github.run_id }}
|
||||
|
||||
group: claude-${{ github.event.issue.number || github.event.pull_request.number }}
|
||||
jobs:
|
||||
claude:
|
||||
# Forgejo workflow if: limitations (expression parser rejects '#' comments):
|
||||
# - pull_request_review_comment / pull_request_comment: Forgejo collapses both
|
||||
# review comments and full reviews into pull_request_comment. Cannot gate on
|
||||
# @claude here — payload fields are empty (run 12084). Check in trigger.ts.
|
||||
# - pull_request_review: Only fires on GitHub, dead code on Forgejo.
|
||||
# - issues: Forgejo does not populate github.event.action (run 12061 skipped
|
||||
# despite action being 'labeled'). Let all through; trigger.ts validates.
|
||||
if: >-
|
||||
(github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
|
||||
# Forgejo collapses both pull_request_review_comment AND pull_request_review
|
||||
# into pull_request_comment. We cannot gate on @claude here because Forgejo's
|
||||
# webhook payload does not populate github.event.comment.body or
|
||||
# github.event.review.body for these events (tested: run 12084 was skipped).
|
||||
# The @claude check is handled in trigger.ts which reads the actual payload.
|
||||
(github.event_name == 'pull_request_review_comment' || github.event_name == 'pull_request_comment') ||
|
||||
# This condition only fires on GitHub (Forgejo never sends pull_request_review).
|
||||
(github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
|
||||
(github.event_name == 'issues')
|
||||
if: ((github.event_name == 'issue_comment' || github.event_name == 'pull_request_review_comment') && contains(github.event.comment.body, '@claude')) || (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) || (github.event_name == 'issues')
|
||||
runs-on: grunt
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: https://${{ secrets.READ_REPO_TOKEN }}@git.wxs.ro/xternal/checkout@v6.0.2
|
||||
with:
|
||||
fetch-depth: 1
|
||||
|
||||
- name: Run Claude Code
|
||||
id: claude
|
||||
uses: ./
|
||||
with:
|
||||
claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
|
||||
github_token: ${{ secrets.CLAUDE_BOT_TOKEN }}
|
||||
bot_id: "48"
|
||||
bot_name: "claude"
|
||||
bot_email: "claude@wxs.ro"
|
||||
platform: "forgejo"
|
||||
assignee_trigger: "claude"
|
||||
env:
|
||||
ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
|
||||
|
||||
- name: Debug on failure
|
||||
if: failure()
|
||||
run: |
|
||||
echo "=== Debug Info ==="
|
||||
echo "Platform: PLATFORM=$PLATFORM FORGEJO=$FORGEJO"
|
||||
echo "Server URL: $GITHUB_SERVER_URL"
|
||||
echo "API URL: $GITHUB_API_URL"
|
||||
echo "Event: ${{ github.event_name }} / ${{ github.event.action }}"
|
||||
echo "Actor: ${{ github.actor }}"
|
||||
echo ""
|
||||
echo "=== Event Payload ==="
|
||||
echo "comment.body: ${{ github.event.comment.body }}"
|
||||
echo "comment.id: ${{ github.event.comment.id }}"
|
||||
echo "review.body: ${{ github.event.review.body }}"
|
||||
echo "review.id: ${{ github.event.review.id }}"
|
||||
echo ""
|
||||
if [ -f "$GITHUB_EVENT_PATH" ]; then
|
||||
echo "--- GITHUB_EVENT_PATH ---"
|
||||
cat "$GITHUB_EVENT_PATH"
|
||||
fi
|
||||
echo ""
|
||||
EXEC_FILE="${{ steps.claude.outputs.execution_file }}"
|
||||
if [ -f "$EXEC_FILE" ]; then
|
||||
echo "--- Execution file contents ---"
|
||||
cat "$EXEC_FILE"
|
||||
else
|
||||
echo "No execution file found"
|
||||
fi
|
||||
- name: Checkout
|
||||
uses: https://${{ secrets.READ_REPO_TOKEN }}@git.wxs.ro/xternal/checkout@v6.0.2
|
||||
- name: Run Claude Code
|
||||
id: claude
|
||||
uses: https://${{ secrets.READ_REPO_TOKEN }}@git.wxs.ro/actions/claude-code-action@main
|
||||
with:
|
||||
claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
|
||||
github_token: ${{ secrets.CLAUDE_BOT_TOKEN }}
|
||||
bot_id: '48'
|
||||
bot_name: claude
|
||||
bot_email: claude@wxs.ro
|
||||
platform: forgejo
|
||||
assignee_trigger: claude
|
||||
env:
|
||||
ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
|
||||
- name: Debug on failure
|
||||
if: failure()
|
||||
run: |
|
||||
echo "=== Debug Info ==="
|
||||
echo "Event: ${{ github.event_name }} / ${{ github.event.action }}"
|
||||
echo "Actor: ${{ github.actor }}"
|
||||
EXEC_FILE="${{ steps.claude.outputs.execution_file }}"
|
||||
if [ -f "$EXEC_FILE" ]; then
|
||||
echo "--- Execution file ---"
|
||||
cat "$EXEC_FILE"
|
||||
else
|
||||
echo "No execution file"
|
||||
fi
|
||||
@@ -0,0 +1,47 @@
|
||||
# Generated by KCL v1.34.3 - DO NOT EDIT
|
||||
# Source: .forgejo/kcl-ci/main.k
|
||||
# kcl-ci local: ~/stuff/gitrepos/wxs/actions/kcl-ci
|
||||
# kcl-ci remote: https://git.wxs.ro/actions/kcl-ci
|
||||
|
||||
name: KCL CI Build
|
||||
'on':
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
paths:
|
||||
- '.forgejo/kcl-ci/**'
|
||||
- '.forgejo/workflows/kcl-ci-build.yml'
|
||||
workflow_dispatch: {}
|
||||
concurrency:
|
||||
group: kcl-ci-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
jobs:
|
||||
wait-for-tests:
|
||||
name: Wait for Tests
|
||||
runs-on: grunt
|
||||
if: github.event_name == 'push'
|
||||
steps:
|
||||
- name: Wait for test checks to complete
|
||||
uses: https://${{ secrets.READ_REPO_TOKEN }}@git.wxs.ro/actions/wait-for-checks@v2
|
||||
with:
|
||||
token: ${{ github.token }}
|
||||
timeout: '300'
|
||||
checks: |-
|
||||
CI / Tests (push),
|
||||
CI / Prettier (push),
|
||||
CI / Type Check (push)
|
||||
build:
|
||||
name: Build KCL Workflows
|
||||
runs-on: grunt
|
||||
needs:
|
||||
- wait-for-tests
|
||||
if: always() && (needs.wait-for-tests.result == 'success' || needs.wait-for-tests.result == 'skipped')
|
||||
steps:
|
||||
- name: Build KCL workflows
|
||||
uses: https://${{ secrets.READ_REPO_TOKEN }}@git.wxs.ro/actions/kcl-ci@v1.34.3
|
||||
with:
|
||||
read-repo-token: ${{ secrets.READ_REPO_TOKEN }}
|
||||
working-dir: '.forgejo/kcl-ci'
|
||||
commit-changes: 'true'
|
||||
file-pattern: '.forgejo/workflows/*.yml'
|
||||
commit-message: 'chore: regenerate workflows from KCL [skip ci]'
|
||||
@@ -1,80 +1,75 @@
|
||||
name: Test Action (Forgejo)
|
||||
# Generated by KCL v1.34.3 - DO NOT EDIT
|
||||
# Source: .forgejo/kcl-ci/main.k
|
||||
# kcl-ci local: ~/stuff/gitrepos/wxs/actions/kcl-ci
|
||||
# kcl-ci remote: https://git.wxs.ro/actions/kcl-ci
|
||||
|
||||
on:
|
||||
name: Test Action (Forgejo)
|
||||
'on':
|
||||
schedule:
|
||||
# Weekly Monday at 06:00 UTC
|
||||
- cron: "0 6 * * 1"
|
||||
- cron: '0 6 * * 1'
|
||||
pull_request:
|
||||
branches:
|
||||
- main
|
||||
- main
|
||||
paths:
|
||||
- "src/**"
|
||||
- "action.yml"
|
||||
- ".forgejo/**"
|
||||
- "base-action/**"
|
||||
workflow_dispatch:
|
||||
|
||||
- src/**
|
||||
- action.yml
|
||||
- '.forgejo/**'
|
||||
- base-action/**
|
||||
workflow_dispatch: {}
|
||||
concurrency:
|
||||
group: test-action-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
test-agent-mode:
|
||||
name: Test Agent Mode on Forgejo
|
||||
runs-on: grunt
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: https://${{ secrets.READ_REPO_TOKEN }}@git.wxs.ro/xternal/checkout@v6.0.2
|
||||
with:
|
||||
fetch-depth: 1
|
||||
- name: Checkout
|
||||
uses: https://${{ secrets.READ_REPO_TOKEN }}@git.wxs.ro/xternal/checkout@v6.0.2
|
||||
- name: Run Claude Code Action (agent mode)
|
||||
id: claude
|
||||
uses: './'
|
||||
with:
|
||||
prompt: Respond with exactly the text FORGEJO_PLATFORM_TEST_OK and nothing else. Do not use any tools.
|
||||
claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
|
||||
github_token: ${{ secrets.FORGEJO_CLAUDE_TOKEN }}
|
||||
platform: forgejo
|
||||
env:
|
||||
ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
|
||||
- name: Verify execution output exists
|
||||
run: |-
|
||||
EXEC_FILE="${{ steps.claude.outputs.execution_file }}"
|
||||
if [ -z "$EXEC_FILE" ]; then
|
||||
echo "FAIL: execution_file output is empty"
|
||||
exit 1
|
||||
fi
|
||||
if [ ! -f "$EXEC_FILE" ]; then
|
||||
echo "FAIL: execution file does not exist at: $EXEC_FILE"
|
||||
exit 1
|
||||
fi
|
||||
echo "OK: execution file exists at: $EXEC_FILE"
|
||||
|
||||
- name: Run Claude Code Action (agent mode)
|
||||
id: claude
|
||||
uses: ./
|
||||
with:
|
||||
prompt: "Respond with exactly the text FORGEJO_PLATFORM_TEST_OK and nothing else. Do not use any tools."
|
||||
claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
|
||||
github_token: ${{ secrets.FORGEJO_CLAUDE_TOKEN }}
|
||||
platform: "forgejo"
|
||||
env:
|
||||
ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
|
||||
|
||||
- name: Verify execution output exists
|
||||
run: |
|
||||
EXEC_FILE="${{ steps.claude.outputs.execution_file }}"
|
||||
if [ -z "$EXEC_FILE" ]; then
|
||||
echo "FAIL: execution_file output is empty"
|
||||
exit 1
|
||||
fi
|
||||
if [ ! -f "$EXEC_FILE" ]; then
|
||||
echo "FAIL: execution file does not exist at: $EXEC_FILE"
|
||||
exit 1
|
||||
fi
|
||||
echo "OK: execution file exists at: $EXEC_FILE"
|
||||
|
||||
# Check that the output contains our test marker
|
||||
if grep -q "FORGEJO_PLATFORM_TEST_OK" "$EXEC_FILE"; then
|
||||
echo "OK: Output contains expected test marker"
|
||||
else
|
||||
echo "WARN: Test marker not found in output (Claude may have formatted differently)"
|
||||
echo "--- Output contents (first 50 lines) ---"
|
||||
head -50 "$EXEC_FILE"
|
||||
fi
|
||||
|
||||
- name: Debug on failure
|
||||
if: failure()
|
||||
run: |
|
||||
echo "=== Debug Info ==="
|
||||
echo "Platform env: PLATFORM=$PLATFORM FORGEJO=$FORGEJO"
|
||||
echo "Server URL: $GITHUB_SERVER_URL"
|
||||
echo "API URL: $GITHUB_API_URL"
|
||||
echo "Event: ${{ github.event_name }}"
|
||||
echo "Actor: ${{ github.actor }}"
|
||||
echo ""
|
||||
EXEC_FILE="${{ steps.claude.outputs.execution_file }}"
|
||||
if [ -f "$EXEC_FILE" ]; then
|
||||
echo "--- Execution file contents ---"
|
||||
cat "$EXEC_FILE"
|
||||
else
|
||||
echo "No execution file found"
|
||||
fi
|
||||
if grep -q "FORGEJO_PLATFORM_TEST_OK" "$EXEC_FILE"; then
|
||||
echo "OK: Output contains expected test marker"
|
||||
else
|
||||
echo "WARN: Test marker not found in output (Claude may have formatted differently)"
|
||||
echo "--- Output contents (first 50 lines) ---"
|
||||
head -50 "$EXEC_FILE"
|
||||
fi
|
||||
- name: Debug on failure
|
||||
if: failure()
|
||||
run: |-
|
||||
echo "=== Debug Info ==="
|
||||
echo "Platform env: PLATFORM=$PLATFORM FORGEJO=$FORGEJO"
|
||||
echo "Server URL: $GITHUB_SERVER_URL"
|
||||
echo "API URL: $GITHUB_API_URL"
|
||||
echo "Event: ${{ github.event_name }}"
|
||||
echo "Actor: ${{ github.actor }}"
|
||||
echo ""
|
||||
EXEC_FILE="${{ steps.claude.outputs.execution_file }}"
|
||||
if [ -f "$EXEC_FILE" ]; then
|
||||
echo "--- Execution file contents ---"
|
||||
cat "$EXEC_FILE"
|
||||
else
|
||||
echo "No execution file found"
|
||||
fi
|
||||
@@ -1,176 +1,166 @@
|
||||
# Generated by KCL v1.34.3 - DO NOT EDIT
|
||||
# Source: .forgejo/kcl-ci/main.k
|
||||
# kcl-ci local: ~/stuff/gitrepos/wxs/actions/kcl-ci
|
||||
# kcl-ci remote: https://git.wxs.ro/actions/kcl-ci
|
||||
|
||||
name: Upstream Sync Check
|
||||
|
||||
on:
|
||||
'on':
|
||||
schedule:
|
||||
# Weekly Monday at 08:00 UTC
|
||||
- cron: "0 8 * * 1"
|
||||
workflow_dispatch:
|
||||
|
||||
- cron: '0 8 * * 1'
|
||||
workflow_dispatch: {}
|
||||
jobs:
|
||||
check-upstream:
|
||||
name: Check for upstream updates
|
||||
runs-on: grunt
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: https://${{ secrets.READ_REPO_TOKEN }}@git.wxs.ro/xternal/checkout@v6.0.2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Checkout
|
||||
uses: https://${{ secrets.READ_REPO_TOKEN }}@git.wxs.ro/xternal/checkout@v6.0.2
|
||||
with:
|
||||
fetch-depth: '0'
|
||||
- name: Configure upstream remote
|
||||
run: |-
|
||||
if ! git remote get-url upstream &> /dev/null; then
|
||||
git remote add upstream https://github.com/anthropics/claude-code-action.git
|
||||
fi
|
||||
- name: Fetch upstream
|
||||
run: git fetch upstream main --quiet
|
||||
- name: Compare with upstream
|
||||
id: compare
|
||||
run: |-
|
||||
BEHIND_COUNT=$(git rev-list main..upstream/main --count)
|
||||
AHEAD_COUNT=$(git rev-list upstream/main..main --count)
|
||||
|
||||
- name: Configure upstream remote
|
||||
run: |
|
||||
if ! git remote get-url upstream &> /dev/null; then
|
||||
git remote add upstream https://github.com/anthropics/claude-code-action.git
|
||||
fi
|
||||
echo "behind=$BEHIND_COUNT" >> "$GITHUB_OUTPUT"
|
||||
echo "ahead=$AHEAD_COUNT" >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: Fetch upstream
|
||||
run: git fetch upstream main --quiet
|
||||
echo "Our main is $BEHIND_COUNT commits behind and $AHEAD_COUNT commits ahead of upstream"
|
||||
|
||||
- name: Compare with upstream
|
||||
id: compare
|
||||
run: |
|
||||
BEHIND_COUNT=$(git rev-list main..upstream/main --count)
|
||||
AHEAD_COUNT=$(git rev-list upstream/main..main --count)
|
||||
if [ "$BEHIND_COUNT" -gt 0 ]; then
|
||||
echo "needs_sync=true" >> "$GITHUB_OUTPUT"
|
||||
|
||||
echo "behind=$BEHIND_COUNT" >> "$GITHUB_OUTPUT"
|
||||
echo "ahead=$AHEAD_COUNT" >> "$GITHUB_OUTPUT"
|
||||
echo "--- New upstream commits ---"
|
||||
git log main..upstream/main --oneline | head -30
|
||||
|
||||
echo "Our main is $BEHIND_COUNT commits behind and $AHEAD_COUNT commits ahead of upstream"
|
||||
echo ""
|
||||
echo "--- Files changed ---"
|
||||
DIFF_STAT=$(git diff --stat main...upstream/main)
|
||||
echo "$DIFF_STAT"
|
||||
|
||||
if [ "$BEHIND_COUNT" -gt 0 ]; then
|
||||
echo "needs_sync=true" >> "$GITHUB_OUTPUT"
|
||||
|
||||
# Generate diff summary
|
||||
echo "--- New upstream commits ---"
|
||||
git log main..upstream/main --oneline | head -30
|
||||
|
||||
echo ""
|
||||
echo "--- Files changed ---"
|
||||
DIFF_STAT=$(git diff --stat main...upstream/main)
|
||||
{
|
||||
echo "diff_stat<<DIFF_EOF"
|
||||
echo "$DIFF_STAT"
|
||||
echo "DIFF_EOF"
|
||||
} >> "$GITHUB_OUTPUT"
|
||||
|
||||
# Save for issue body (escape newlines for multiline output)
|
||||
{
|
||||
echo "diff_stat<<DIFF_EOF"
|
||||
echo "$DIFF_STAT"
|
||||
echo "DIFF_EOF"
|
||||
} >> "$GITHUB_OUTPUT"
|
||||
{
|
||||
echo "commit_log<<LOG_EOF"
|
||||
git log main..upstream/main --oneline | head -30
|
||||
echo "LOG_EOF"
|
||||
} >> "$GITHUB_OUTPUT"
|
||||
else
|
||||
echo "needs_sync=false" >> "$GITHUB_OUTPUT"
|
||||
echo "Already up to date with upstream"
|
||||
fi
|
||||
- name: Check for existing sync issue
|
||||
if: steps.compare.outputs.needs_sync == 'true'
|
||||
id: existing
|
||||
run: |-
|
||||
RESPONSE=$(curl -s \
|
||||
-H "Authorization: token ${{ github.token }}" \
|
||||
-H "Content-Type: application/json" \
|
||||
"${{ env.GITHUB_API_URL }}/repos/${{ github.repository }}/issues?state=open&labels=upstream-sync&limit=1")
|
||||
|
||||
{
|
||||
echo "commit_log<<LOG_EOF"
|
||||
git log main..upstream/main --oneline | head -30
|
||||
echo "LOG_EOF"
|
||||
} >> "$GITHUB_OUTPUT"
|
||||
else
|
||||
echo "needs_sync=false" >> "$GITHUB_OUTPUT"
|
||||
echo "Already up to date with upstream"
|
||||
fi
|
||||
ISSUE_COUNT=$(echo "$RESPONSE" | jq 'length')
|
||||
|
||||
- name: Check for existing sync issue
|
||||
if: steps.compare.outputs.needs_sync == 'true'
|
||||
id: existing
|
||||
run: |
|
||||
# Search for open issues with the upstream-sync label
|
||||
RESPONSE=$(curl -s \
|
||||
if [ "$ISSUE_COUNT" -gt 0 ]; then
|
||||
ISSUE_NUMBER=$(echo "$RESPONSE" | jq '.[0].number')
|
||||
echo "issue_exists=true" >> "$GITHUB_OUTPUT"
|
||||
echo "issue_number=$ISSUE_NUMBER" >> "$GITHUB_OUTPUT"
|
||||
echo "Found existing sync issue #$ISSUE_NUMBER"
|
||||
else
|
||||
echo "issue_exists=false" >> "$GITHUB_OUTPUT"
|
||||
echo "No existing sync issue found"
|
||||
fi
|
||||
- name: Create upstream-sync label
|
||||
if: steps.compare.outputs.needs_sync == 'true'
|
||||
run: |-
|
||||
curl -s -o /dev/null -w "%{http_code}" \
|
||||
-X POST \
|
||||
-H "Authorization: token ${{ github.token }}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"name":"upstream-sync","color":"#0075ca","description":"Upstream sync tracking"}' \
|
||||
"${{ env.GITHUB_API_URL }}/repos/${{ github.repository }}/labels" || true
|
||||
- name: Create or update sync issue
|
||||
if: steps.compare.outputs.needs_sync == 'true'
|
||||
run: |-
|
||||
BEHIND="${{ steps.compare.outputs.behind }}"
|
||||
AHEAD="${{ steps.compare.outputs.ahead }}"
|
||||
COMMIT_LOG=$(cat <<'LOG_EOF'
|
||||
${{ steps.compare.outputs.commit_log }}
|
||||
LOG_EOF
|
||||
)
|
||||
DIFF_STAT=$(cat <<'DIFF_EOF'
|
||||
${{ steps.compare.outputs.diff_stat }}
|
||||
DIFF_EOF
|
||||
)
|
||||
|
||||
BODY=$(cat <<BODY_EOF
|
||||
## Upstream Sync Required
|
||||
|
||||
Our \`main\` branch is **${BEHIND} commits behind** upstream (\`anthropics/claude-code-action\`).
|
||||
We are **${AHEAD} commits ahead** (our Forgejo-specific changes).
|
||||
|
||||
### New upstream commits (latest ${BEHIND}, max 30 shown)
|
||||
|
||||
\`\`\`
|
||||
${COMMIT_LOG}
|
||||
\`\`\`
|
||||
|
||||
### Files changed
|
||||
|
||||
\`\`\`
|
||||
${DIFF_STAT}
|
||||
\`\`\`
|
||||
|
||||
### How to merge
|
||||
|
||||
\`\`\`bash
|
||||
git fetch upstream main
|
||||
git merge upstream/main
|
||||
# Resolve any conflicts in the 3-4 modified files (run.ts, tag/index.ts, etc.)
|
||||
bun test
|
||||
git push origin main
|
||||
\`\`\`
|
||||
|
||||
### Conflict-prone files
|
||||
|
||||
These files have Forgejo modifications and may conflict:
|
||||
- \`src/entrypoints/run.ts\`
|
||||
- \`src/modes/tag/index.ts\`
|
||||
- \`src/mcp/install-mcp-server.ts\`
|
||||
- \`action.yml\`
|
||||
|
||||
_Auto-generated by upstream-sync workflow on $(date -u +%Y-%m-%d)_
|
||||
BODY_EOF
|
||||
)
|
||||
|
||||
TITLE="Upstream sync: ${BEHIND} new commits from anthropics/claude-code-action"
|
||||
|
||||
if [ "${{ steps.existing.outputs.issue_exists }}" = "true" ]; then
|
||||
ISSUE_NUMBER="${{ steps.existing.outputs.issue_number }}"
|
||||
curl -s -o /dev/null \
|
||||
-X PATCH \
|
||||
-H "Authorization: token ${{ github.token }}" \
|
||||
-H "Content-Type: application/json" \
|
||||
"${GITHUB_API_URL}/repos/${{ github.repository }}/issues?state=open&labels=upstream-sync&limit=1")
|
||||
|
||||
ISSUE_COUNT=$(echo "$RESPONSE" | jq 'length')
|
||||
|
||||
if [ "$ISSUE_COUNT" -gt 0 ]; then
|
||||
ISSUE_NUMBER=$(echo "$RESPONSE" | jq '.[0].number')
|
||||
echo "issue_exists=true" >> "$GITHUB_OUTPUT"
|
||||
echo "issue_number=$ISSUE_NUMBER" >> "$GITHUB_OUTPUT"
|
||||
echo "Found existing sync issue #$ISSUE_NUMBER"
|
||||
else
|
||||
echo "issue_exists=false" >> "$GITHUB_OUTPUT"
|
||||
echo "No existing sync issue found"
|
||||
fi
|
||||
|
||||
- name: Create upstream-sync label
|
||||
if: steps.compare.outputs.needs_sync == 'true'
|
||||
run: |
|
||||
# Create label if it doesn't exist (ignore 409 conflict)
|
||||
curl -s -o /dev/null -w "%{http_code}" \
|
||||
-d "$(jq -n --arg title "$TITLE" --arg body "$BODY" '{title: $title, body: $body}')" \
|
||||
"${{ env.GITHUB_API_URL }}/repos/${{ github.repository }}/issues/${ISSUE_NUMBER}"
|
||||
echo "Updated existing issue #${ISSUE_NUMBER}"
|
||||
else
|
||||
curl -s -o /dev/null \
|
||||
-X POST \
|
||||
-H "Authorization: token ${{ github.token }}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"name":"upstream-sync","color":"#0075ca","description":"Upstream sync tracking"}' \
|
||||
"${GITHUB_API_URL}/repos/${{ github.repository }}/labels" || true
|
||||
|
||||
- name: Create or update sync issue
|
||||
if: steps.compare.outputs.needs_sync == 'true'
|
||||
run: |
|
||||
BEHIND="${{ steps.compare.outputs.behind }}"
|
||||
AHEAD="${{ steps.compare.outputs.ahead }}"
|
||||
COMMIT_LOG=$(cat <<'LOG_EOF'
|
||||
${{ steps.compare.outputs.commit_log }}
|
||||
LOG_EOF
|
||||
)
|
||||
DIFF_STAT=$(cat <<'DIFF_EOF'
|
||||
${{ steps.compare.outputs.diff_stat }}
|
||||
DIFF_EOF
|
||||
)
|
||||
|
||||
BODY=$(cat <<BODY_EOF
|
||||
## Upstream Sync Required
|
||||
|
||||
Our \`main\` branch is **${BEHIND} commits behind** upstream (\`anthropics/claude-code-action\`).
|
||||
We are **${AHEAD} commits ahead** (our Forgejo-specific changes).
|
||||
|
||||
### New upstream commits (latest ${BEHIND}, max 30 shown)
|
||||
|
||||
\`\`\`
|
||||
${COMMIT_LOG}
|
||||
\`\`\`
|
||||
|
||||
### Files changed
|
||||
|
||||
\`\`\`
|
||||
${DIFF_STAT}
|
||||
\`\`\`
|
||||
|
||||
### How to merge
|
||||
|
||||
\`\`\`bash
|
||||
git fetch upstream main
|
||||
git merge upstream/main
|
||||
# Resolve any conflicts in the 3-4 modified files (run.ts, tag/index.ts, etc.)
|
||||
bun test
|
||||
git push origin main
|
||||
\`\`\`
|
||||
|
||||
### Conflict-prone files
|
||||
|
||||
These files have Forgejo modifications and may conflict:
|
||||
- \`src/entrypoints/run.ts\`
|
||||
- \`src/modes/tag/index.ts\`
|
||||
- \`src/mcp/install-mcp-server.ts\`
|
||||
- \`action.yml\`
|
||||
|
||||
_Auto-generated by upstream-sync workflow on $(date -u +%Y-%m-%d)_
|
||||
BODY_EOF
|
||||
)
|
||||
|
||||
TITLE="Upstream sync: ${BEHIND} new commits from anthropics/claude-code-action"
|
||||
|
||||
if [ "${{ steps.existing.outputs.issue_exists }}" = "true" ]; then
|
||||
# Update existing issue
|
||||
ISSUE_NUMBER="${{ steps.existing.outputs.issue_number }}"
|
||||
curl -s -o /dev/null \
|
||||
-X PATCH \
|
||||
-H "Authorization: token ${{ github.token }}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "$(jq -n --arg title "$TITLE" --arg body "$BODY" '{title: $title, body: $body}')" \
|
||||
"${GITHUB_API_URL}/repos/${{ github.repository }}/issues/${ISSUE_NUMBER}"
|
||||
echo "Updated existing issue #${ISSUE_NUMBER}"
|
||||
else
|
||||
# Create new issue
|
||||
curl -s -o /dev/null \
|
||||
-X POST \
|
||||
-H "Authorization: token ${{ github.token }}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "$(jq -n --arg title "$TITLE" --arg body "$BODY" '{title: $title, body: $body, labels: [{"name": "upstream-sync"}]}')" \
|
||||
"${GITHUB_API_URL}/repos/${{ github.repository }}/issues"
|
||||
echo "Created new upstream sync issue"
|
||||
fi
|
||||
-d "$(jq -n --arg title "$TITLE" --arg body "$BODY" '{title: $title, body: $body, labels: [{"name": "upstream-sync"}]}')" \
|
||||
"${{ env.GITHUB_API_URL }}/repos/${{ github.repository }}/issues"
|
||||
echo "Created new upstream sync issue"
|
||||
fi
|
||||
Reference in new issue
Block a user