Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions .github/workflows/conflict-resolver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
with:
ref: ${{ env.SOURCE }}
fetch-depth: 0
token: ${{ secrets.CI_BOT_PAT || secrets.ARI_PAT || secrets.GITHUB_TOKEN }}
token: ${{ secrets.ARI_PAT || secrets.GITHUB_TOKEN }}

- name: Validate branches
id: validate_branches
Expand Down Expand Up @@ -118,8 +118,7 @@ jobs:
- name: Trigger Gemini Orchestrator
if: steps.validate_branches.outputs.skipped != 'true' && steps.resolve.outputs.unresolved-files == '' && env.PR_NUMBER && env.PR_NUMBER != '0'
env:
# Use CI_BOT_PAT if available to ensure workflow is triggered (GITHUB_TOKEN prevents recursion)
GH_TOKEN: ${{ secrets.CI_BOT_PAT || secrets.ARI_PAT || secrets.GITHUB_TOKEN }}
GH_TOKEN: ${{ secrets.ARI_PAT || secrets.GITHUB_TOKEN }}
HEAD_SHA: ${{ steps.commit_push.outputs.resolved_sha }}
BASE_SHA: ${{ steps.validate_branches.outputs.base_sha }}
run: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ jobs:
SPOTIFY_CLIENT_ID=${{ secrets.SPOTIFY_CLIENT_ID }}
SPOTIFY_CLIENT_SECRET=${{ secrets.SPOTIFY_CLIENT_SECRET }}
SPOTIFY_CALLBACK_URL=${{ secrets.SPOTIFY_CALLBACK_URL }}
INTERNAL_TOKEN_DELIVERY_SECRET=${{ secrets.INTERNAL_TOKEN_DELIVERY_SECRET }}
ENCRYPTION_KEY=${{ secrets.ENCRYPTION_KEY }}
GOOGLE_DOC_IFRAME_URL="${{ secrets.GOOGLE_DOC_IFRAME_URL }}"
GOOGLE_DOC_WORKOUT_URL="${{ secrets.GOOGLE_DOC_WORKOUT_URL }}"
SPOTIFY_DEBUG=false
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e-ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
test_pr_squash:
runs-on: ubuntu-latest
env:
GH_TOKEN: ${{ secrets.CI_BOT_PAT || secrets.ARI_PAT || secrets.GITHUB_TOKEN }}
GH_TOKEN: ${{ secrets.ARI_PAT || secrets.GITHUB_TOKEN }}
steps:
- name: Install jq
run: |
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
test_conflict_resolver:
runs-on: ubuntu-latest
env:
GH_TOKEN: ${{ secrets.CI_BOT_PAT || secrets.ARI_PAT || secrets.GITHUB_TOKEN }}
GH_TOKEN: ${{ secrets.ARI_PAT || secrets.GITHUB_TOKEN }}
steps:
- name: Install jq
run: |
Expand Down Expand Up @@ -203,7 +203,7 @@ jobs:
test_pr_squash_rebase:
runs-on: ubuntu-latest
env:
GH_TOKEN: ${{ secrets.CI_BOT_PAT || secrets.ARI_PAT || secrets.GITHUB_TOKEN }}
GH_TOKEN: ${{ secrets.ARI_PAT || secrets.GITHUB_TOKEN }}
steps:
- name: Install jq
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@ jobs:
]
runs-on: ubuntu-latest
env:
GH_TOKEN: ${{ secrets.GH_TOKEN || secrets.ARI_PAT || secrets.GITHUB_TOKEN }}
GH_TOKEN: ${{ secrets.ARI_PAT || secrets.GITHUB_TOKEN }}
outputs:
failure-report-json: ${{ steps.generate-failure-report.outputs.failure_report_json }}
steps:
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/pr-squash.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
- name: Checkout PR branch
uses: actions/checkout@v4
with:
token: ${{ secrets.PAT_TOKEN || secrets.CI_BOT_PAT || secrets.ARI_PAT || secrets.GITHUB_TOKEN }}
token: ${{ secrets.PAT_TOKEN || secrets.ARI_PAT || secrets.GITHUB_TOKEN }}
ref: ${{ steps.pr_data.outputs.head_ref }}
fetch-depth: 0

Expand Down Expand Up @@ -212,7 +212,7 @@ jobs:
- name: Checkout PR branch
uses: actions/checkout@v4
with:
token: ${{ secrets.CI_BOT_PAT || secrets.ARI_PAT || secrets.GITHUB_TOKEN }}
token: ${{ secrets.ARI_PAT || secrets.GITHUB_TOKEN }}
ref: ${{ needs.squash-and-rebase.outputs.head_ref }}
fetch-depth: 0
- name: Check for file changes
Expand All @@ -233,8 +233,7 @@ jobs:
fi
- name: Trigger Gemini Orchestrator
env:
# Use CI_BOT_PAT if available to ensure workflow is triggered (GITHUB_TOKEN prevents recursion)
GH_TOKEN: ${{ secrets.CI_BOT_PAT || secrets.ARI_PAT || secrets.GITHUB_TOKEN }}
GH_TOKEN: ${{ secrets.ARI_PAT || secrets.GITHUB_TOKEN }}
HEAD_BRANCH: ${{ needs.squash-and-rebase.outputs.head_ref }}
BASE_BRANCH: ${{ needs.squash-and-rebase.outputs.base_ref }}
BASE_SHA: ${{ needs.squash-and-rebase.outputs.base_sha }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reusable-create-review-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
name: review-result
run-id: ${{ inputs.run_id }}
path: .
github-token: ${{ secrets.gh_token }}
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Verify Artifact
id: verify_artifact
Expand All @@ -117,7 +117,7 @@ jobs:
env:
PR_NUMBER: ${{ inputs.pr_number }}
BASE_SHA: ${{ inputs.base_sha }}
GH_TOKEN: ${{ secrets.gh_token }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_REPOSITORY: ${{ github.repository }}
run: |
pnpm tsx scripts/ci/run-create-review-issues.ts
2 changes: 1 addition & 1 deletion .github/workflows/reusable-gemini-invoke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ jobs:
- name: Run Gemini Client
env:
GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COMMENT_BODY: ${{ inputs.comment_body }}
run: pnpm tsx scripts/gemini-client.ts --comment-body "$COMMENT_BODY"
10 changes: 5 additions & 5 deletions .github/workflows/reusable-jules-command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
id: pr_context
if: env.COMMAND == 'new'
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PR_NUMBER: ${{ inputs.issue_number }}
run: |
# Fetch basic PR data
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
id: find_session_id
if: env.COMMAND == 'delete'
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PR_NUMBER: ${{ inputs.issue_number }}
run: |
SESSION_ID=$(gh pr view "$PR_NUMBER" --json comments --jq '.comments | .[] | .body' | grep -oP '(?<=<!-- JULES_SESSION_ID=)\S+(?= *-->)' | tail -n 1)
Expand Down Expand Up @@ -193,7 +193,7 @@ jobs:
if: success() && env.COMMAND == 'new'
uses: actions/github-script@v6
with:
github-token: ${{ secrets.GH_TOKEN }}
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const sessionId = "${{ steps.jules_op_new.outputs.session_id }}";
if (sessionId) {
Expand All @@ -209,7 +209,7 @@ jobs:
if: success()
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GH_TOKEN }}
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
github.rest.reactions.createForIssueComment({
owner: context.repo.owner,
Expand All @@ -221,7 +221,7 @@ jobs:
if: failure()
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GH_TOKEN }}
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const errorMessageNew = `${{ steps.jules_op_new.outputs.error_message || '' }}`;
const errorMessageDelete = `${{ steps.jules_op_delete.outputs.error_message || '' }}`;
Expand Down
Loading