Skip to content

fix: auto-stage-candidate active dispatch (replaces broken workflow_run trigger) #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bash0816 merged 1 commit into from
Jul 15, 2026
Merged

fix: auto-stage-candidate active dispatch (replaces broken workflow_run trigger) #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 33 additions & 24 deletions .github/workflows/auto-stage-candidate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
name: Auto Stage Candidate

on:
workflow_run:
workflows: ["external-build-android-aarch64"]
types: [completed]
workflow_dispatch:
inputs:
build_run_id:
description: "Run ID of the external-build-android-aarch64 workflow to stage"
required: true
type: string

permissions:
contents: write
Expand All @@ -12,11 +15,29 @@ permissions:

jobs:
stage:
if: github.event.workflow_run.conclusion == 'success'
runs-on: ubuntu-latest
env:
GH_TOKEN: ${{ github.token }}
steps:
- name: Verify build run identity and success
env:
BUILD_RUN_ID: ${{ inputs.build_run_id }}
run: |
set -eu
run_json=$(gh api "repos/bash0816/Codex-Termux/actions/runs/${BUILD_RUN_ID}")
run_path=$(node -p "JSON.parse(process.argv[1]).path" "$run_json")
conclusion=$(node -p "JSON.parse(process.argv[1]).conclusion" "$run_json")
status=$(node -p "JSON.parse(process.argv[1]).status" "$run_json")
if [ "$run_path" != ".github/workflows/external-build-android-aarch64.yml" ]; then
echo "ERROR: run $BUILD_RUN_ID is not from external-build-android-aarch64.yml (path: $run_path)" >&2
exit 1
fi
if [ "$status" != "completed" ] || [ "$conclusion" != "success" ]; then
echo "ERROR: run $BUILD_RUN_ID is not a successful completed run (status=$status conclusion=$conclusion)" >&2
exit 1
fi
echo "Verified: run $BUILD_RUN_ID is a successful external-build-android-aarch64.yml run"

- uses: actions/checkout@v7
with:
ref: main
Expand All @@ -29,7 +50,7 @@ jobs:

- name: Download artifact
env:
WORKFLOW_RUN_ID: ${{ github.event.workflow_run.id }}
WORKFLOW_RUN_ID: ${{ inputs.build_run_id }}
run: |
set -eu
mkdir -p /tmp/codex-artifact
Expand All @@ -42,7 +63,7 @@ jobs:
- name: Verify and extract artifact metadata
id: artifact
env:
WORKFLOW_RUN_ID: ${{ github.event.workflow_run.id }}
WORKFLOW_RUN_ID: ${{ inputs.build_run_id }}
run: |
set -eu
MANIFEST_FILE="$ARTIFACT_DIR/manifest.json"
Expand Down Expand Up @@ -74,17 +95,11 @@ jobs:
} >> "$GITHUB_OUTPUT"
echo "Verified: codex $ver from openai/codex ($source_ref)"

# NOTE: candidate_state_status='codex_build_dispatched' is written by
# codex-version-watch.yml only to the automation/codex-<version> branch,
# never to main (see codex-version-watch.yml 'Create automation branch
# and update manifest' step: git checkout -B $branch origin/main, then
# commit/push only to $branch). Reading the state from main meant this
# gate was permanently false; every prior candidate publish was staged
# by hand instead (see commit 2affb800 on the 0.142.2 automation branch).
- name: Check candidate branch state
id: check_state
env:
VER: ${{ steps.artifact.outputs.ver }}
BUILD_RUN_ID: ${{ inputs.build_run_id }}
run: |
set -eu
branch="automation/codex-${VER}"
Expand All @@ -100,26 +115,20 @@ jobs:

candidate_ver=$(node -p "JSON.parse(require('fs').readFileSync('/tmp/candidate-manifest.json','utf8')).latest_candidate_version")
candidate_state=$(node -p "JSON.parse(require('fs').readFileSync('/tmp/candidate-manifest.json','utf8')).candidate_state_status")
expected_run_id=$(node -p "JSON.parse(require('fs').readFileSync('/tmp/candidate-manifest.json','utf8')).expected_build_run_id || ''")

if [ "$candidate_ver" = "$VER" ] && [ "$candidate_state" = "codex_build_dispatched" ]; then
if [ "$candidate_ver" = "$VER" ] && [ "$candidate_state" = "codex_build_dispatched" ] && [ "$expected_run_id" = "$BUILD_RUN_ID" ]; then
echo "should_stage=true" >> "$GITHUB_OUTPUT"
echo "Candidate state OK: $candidate_state (version $candidate_ver)"
echo "Candidate state OK: $candidate_state (version $candidate_ver, run $BUILD_RUN_ID matches expected_build_run_id)"
else
echo "should_stage=false" >> "$GITHUB_OUTPUT"
echo "Skipping: branch $branch candidate version=$candidate_ver state=$candidate_state (expected version=$VER state=codex_build_dispatched)"
echo "Skipping: branch $branch candidate version=$candidate_ver state=$candidate_state expected_run_id=$expected_run_id (input build_run_id=$BUILD_RUN_ID)"
fi

# Commits the promotion fields directly onto the existing automation
# branch (fast-forward from origin/$branch, which was fetched above),
# instead of an untested separate staging-branch push. This mirrors
# what has always been done by hand (commit 2affb800 pattern) and keeps
# merge-to-main + npm-package.yml dispatch as the existing human-gated
# step (real release history shows npm-package.yml has only ever been
# dispatched with ref=main, never ref=staging).
- name: Update manifest and package.json on candidate branch
if: steps.check_state.outputs.should_stage == 'true'
env:
BUILD_RUN_ID: ${{ github.event.workflow_run.id }}
BUILD_RUN_ID: ${{ inputs.build_run_id }}
SOURCE_REF: ${{ steps.artifact.outputs.source_ref }}
SOURCE_SHA: ${{ steps.artifact.outputs.source_sha }}
VER: ${{ steps.artifact.outputs.ver }}
Expand Down
68 changes: 68 additions & 0 deletions .github/workflows/external-build-android-aarch64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,57 @@ permissions:
contents: read

jobs:
record-run-id:
runs-on: ubuntu-latest
permissions:
contents: write
env:
GH_TOKEN: ${{ github.token }}
steps:
- uses: actions/checkout@v7
with:
token: ${{ github.token }}
fetch-depth: 0

- uses: actions/setup-node@v6
with:
node-version: "22"

- name: Record expected build run ID on candidate branch
env:
SOURCE_REF: ${{ inputs.source_ref }}
RUN_ID: ${{ github.run_id }}
run: |
set -eu
ver="${SOURCE_REF#rust-v}"
echo "$ver" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+$' || {
echo "source_ref ($SOURCE_REF) is not a rust-vX.Y.Z tag; skipping run ID recording"
exit 0
}
branch="automation/codex-${ver}"
if ! git fetch origin "$branch:refs/remotes/origin/$branch" 2>/dev/null; then
echo "Candidate branch $branch not found; skipping run ID recording (likely a manual/test build)"
exit 0
fi
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git checkout -B "$branch" "origin/$branch"
node -e "
const fs = require('fs');
const p = 'config/codex-termux-release-manifest.json';
const m = JSON.parse(fs.readFileSync(p, 'utf8'));
m.expected_build_run_id = String(process.env.RUN_ID);
fs.writeFileSync(p, JSON.stringify(m, null, 2) + '\n');
"
git add config/codex-termux-release-manifest.json
if git diff --cached --quiet; then
echo "No changes to commit"
exit 0
fi
git commit -m "chore: record expected build run ID ${RUN_ID} for ${ver}"
git push origin "HEAD:$branch"
echo "Recorded expected_build_run_id=${RUN_ID} on $branch"

build:
runs-on: ubuntu-22.04
timeout-minutes: 180
Expand Down Expand Up @@ -627,3 +678,20 @@ jobs:
name: codex-external-android-aarch64-${{ github.run_id }}
path: ${{ env.BUNDLE_DIR }}
if-no-files-found: error

dispatch-stage:
needs: [record-run-id, build]
if: needs.build.result == 'success' && needs.record-run-id.result == 'success'
runs-on: ubuntu-latest
permissions:
actions: write
env:
GH_TOKEN: ${{ github.token }}
steps:
- name: Dispatch auto-stage-candidate
run: |
set -eu
gh workflow run auto-stage-candidate.yml \
--repo bash0816/Codex-Termux \
-f build_run_id=${{ github.run_id }}
Comment on lines +694 to +696

@chatgpt-codex-connector chatgpt-codex-connector Bot Jul 14, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Dispatch staging only after the build run completes

When this job dispatches auto-stage-candidate, the source workflow run is still in progress because dispatch-stage itself has not finished yet. The dispatched workflow immediately queries this same ${{ github.run_id }} and requires status=completed and conclusion=success, so the actively dispatched run will see in_progress/null and exit before staging; successful builds therefore won't auto-stage unless someone dispatches the workflow manually after the build workflow has completed.

Useful? React with 👍 / 👎.

echo "Dispatched auto-stage-candidate.yml for build run ${{ github.run_id }}"
Loading