diff --git a/.github/actions/setup-gcp/action.yml b/.github/actions/setup-gcp/action.yml index 39e89adc8f..85d2e9d9c5 100644 --- a/.github/actions/setup-gcp/action.yml +++ b/.github/actions/setup-gcp/action.yml @@ -8,6 +8,10 @@ inputs: gcp_project_id: description: 'GCP project ID — passed to google-github-actions/auth so the runner env has GOOGLE_CLOUD_PROJECT' required: false + fullsend-dir: + description: 'Path to fullsend config directory (empty for per-org workspace root layout)' + required: false + default: '' runs: using: composite @@ -34,4 +38,6 @@ runs: - name: Prepare sandbox credentials shell: bash - run: bash scripts/prepare-sandbox-credentials.sh + env: + FULLSEND_DIR: ${{ inputs.fullsend-dir }} + run: bash "${FULLSEND_DIR:+$FULLSEND_DIR/}scripts/prepare-sandbox-credentials.sh" diff --git a/.github/workflows/reusable-code.yml b/.github/workflows/reusable-code.yml index 0e47e6401b..ba62b15345 100644 --- a/.github/workflows/reusable-code.yml +++ b/.github/workflows/reusable-code.yml @@ -153,7 +153,8 @@ jobs: REPO_FULL_NAME: ${{ inputs.source_repo }} GITHUB_ISSUE_URL: ${{ fromJSON(inputs.event_payload).issue.html_url }} COMMENT_BODY: ${{ fromJSON(inputs.event_payload).comment.body }} - run: bash scripts/pre-code.sh + FULLSEND_DIR: ${{ inputs.install_mode == 'per-repo' && '.fullsend' || '' }} + run: bash "${FULLSEND_DIR:+$FULLSEND_DIR/}scripts/pre-code.sh" - name: Setup GCP and prepare credentials if: steps.validate.outputs.skipped != 'true' @@ -161,6 +162,7 @@ jobs: with: gcp_wif_provider: ${{ secrets.FULLSEND_GCP_WIF_PROVIDER }} gcp_project_id: ${{ secrets.FULLSEND_GCP_PROJECT_ID }} + fullsend-dir: ${{ inputs.install_mode == 'per-repo' && '.fullsend' || '' }} - name: Resolve bot identity if: steps.validate.outputs.skipped != 'true' diff --git a/.github/workflows/reusable-fix.yml b/.github/workflows/reusable-fix.yml index 1f1cdb9a47..3fddc99522 100644 --- a/.github/workflows/reusable-fix.yml +++ b/.github/workflows/reusable-fix.yml @@ -366,13 +366,15 @@ jobs: TRIGGER_SOURCE: ${{ inputs.trigger_source }} FIX_ITERATION: ${{ steps.context.outputs.iteration }} HUMAN_INSTRUCTION: ${{ steps.context.outputs.instruction }} - run: bash scripts/pre-fix.sh + FULLSEND_DIR: ${{ inputs.install_mode == 'per-repo' && '.fullsend' || '' }} + run: bash "${FULLSEND_DIR:+$FULLSEND_DIR/}scripts/pre-fix.sh" - name: Setup GCP and prepare credentials uses: ./.defaults/.github/actions/setup-gcp with: gcp_wif_provider: ${{ secrets.FULLSEND_GCP_WIF_PROVIDER }} gcp_project_id: ${{ secrets.FULLSEND_GCP_PROJECT_ID }} + fullsend-dir: ${{ inputs.install_mode == 'per-repo' && '.fullsend' || '' }} - name: Setup agent environment env: diff --git a/.github/workflows/reusable-prioritize.yml b/.github/workflows/reusable-prioritize.yml index d69c0b59e2..c8fc8e1bbe 100644 --- a/.github/workflows/reusable-prioritize.yml +++ b/.github/workflows/reusable-prioritize.yml @@ -135,6 +135,7 @@ jobs: with: gcp_wif_provider: ${{ secrets.FULLSEND_GCP_WIF_PROVIDER }} gcp_project_id: ${{ secrets.FULLSEND_GCP_PROJECT_ID }} + fullsend-dir: ${{ inputs.install_mode == 'per-repo' && '.fullsend' || '' }} - name: Setup agent environment env: diff --git a/.github/workflows/reusable-retro.yml b/.github/workflows/reusable-retro.yml index 6da12a7f33..f05d102cb2 100644 --- a/.github/workflows/reusable-retro.yml +++ b/.github/workflows/reusable-retro.yml @@ -148,6 +148,7 @@ jobs: with: gcp_wif_provider: ${{ secrets.FULLSEND_GCP_WIF_PROVIDER }} gcp_project_id: ${{ secrets.FULLSEND_GCP_PROJECT_ID }} + fullsend-dir: ${{ inputs.install_mode == 'per-repo' && '.fullsend' || '' }} - name: Setup agent environment env: diff --git a/.github/workflows/reusable-review.yml b/.github/workflows/reusable-review.yml index 0217ab7673..7a7ce8785a 100644 --- a/.github/workflows/reusable-review.yml +++ b/.github/workflows/reusable-review.yml @@ -153,13 +153,15 @@ jobs: || fromJSON(inputs.event_payload).issue.number }} ORG_NAME: ${{ github.repository_owner }} REVIEW_APP_CLIENT_ID: ${{ vars.FULLSEND_REVIEW_CLIENT_ID }} - run: bash scripts/pre-fetch-prior-review.sh + FULLSEND_DIR: ${{ inputs.install_mode == 'per-repo' && '.fullsend' || '' }} + run: bash "${FULLSEND_DIR:+$FULLSEND_DIR/}scripts/pre-fetch-prior-review.sh" - name: Setup GCP and prepare credentials uses: ./.defaults/.github/actions/setup-gcp with: gcp_wif_provider: ${{ secrets.FULLSEND_GCP_WIF_PROVIDER }} gcp_project_id: ${{ secrets.FULLSEND_GCP_PROJECT_ID }} + fullsend-dir: ${{ inputs.install_mode == 'per-repo' && '.fullsend' || '' }} - name: Setup agent environment env: diff --git a/.github/workflows/reusable-triage.yml b/.github/workflows/reusable-triage.yml index 0d3aba19dc..2a56f69de8 100644 --- a/.github/workflows/reusable-triage.yml +++ b/.github/workflows/reusable-triage.yml @@ -149,6 +149,7 @@ jobs: with: gcp_wif_provider: ${{ secrets.FULLSEND_GCP_WIF_PROVIDER }} gcp_project_id: ${{ secrets.FULLSEND_GCP_PROJECT_ID }} + fullsend-dir: ${{ inputs.install_mode == 'per-repo' && '.fullsend' || '' }} - name: Setup agent environment env: