mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-12-03 09:53:45 +00:00
fix(ci): prefix stainless branches with fork author (#4187)
# What does this PR do? <!-- Provide a short summary of what this PR does and why. Link to relevant issues if applicable. --> I believe that should avoid CI issues seen in https://github.com/llamastack/llama-stack/pull/4173. Error we see in Stainless logs: ``` (cannot lock ref 'refs/heads/preview/base/fix/issue-3797-metadata-validation': 'refs/heads/preview/base/fix' exists; cannot create 'refs/heads/preview/base/fix/issue-3797-metadata-validation') ``` The issue is that if a branch `fix` exists, `fix/<whatever>` cannot be created (that's how git refs work unfortunately...). The fix in this PR is to ensure PRs from forks are using the author as a prefix. In addition we will do changes to the Stainless API to return better error messages here, it should have been a 4xx with a meaningful error, not a 500. And we will likely need to delete the `fix` branch. <!-- If resolving an issue, uncomment and update the line below --> <!-- Closes #[issue-number] --> ## Test Plan <!-- Describe the tests you ran to verify your changes with result summaries. *Provide clear instructions so the plan can be easily re-executed.* -->
This commit is contained in:
parent
40b11efac4
commit
1e4e02e622
1 changed files with 52 additions and 4 deletions
56
.github/workflows/stainless-builds.yml
vendored
56
.github/workflows/stainless-builds.yml
vendored
|
|
@ -59,6 +59,30 @@ jobs:
|
||||||
ref: ${{ github.event.pull_request.head.sha }}
|
ref: ${{ github.event.pull_request.head.sha }}
|
||||||
fetch-depth: 2
|
fetch-depth: 2
|
||||||
|
|
||||||
|
# Compute the Stainless branch name, prefixing with fork owner if PR is from a fork.
|
||||||
|
# For fork PRs like "contributor:fix/issue-123", this creates "preview/contributor/fix/issue-123"
|
||||||
|
# For same-repo PRs, this creates "preview/fix/issue-123"
|
||||||
|
- name: Compute branch names
|
||||||
|
id: branch-names
|
||||||
|
run: |
|
||||||
|
HEAD_REPO="${{ github.event.pull_request.head.repo.full_name }}"
|
||||||
|
BASE_REPO="${{ github.repository }}"
|
||||||
|
BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
|
||||||
|
|
||||||
|
if [ "$HEAD_REPO" != "$BASE_REPO" ]; then
|
||||||
|
# Fork PR: prefix with fork owner for isolation
|
||||||
|
FORK_OWNER="${{ github.event.pull_request.head.repo.owner.login }}"
|
||||||
|
PREVIEW_BRANCH="preview/${FORK_OWNER}/${BRANCH_NAME}"
|
||||||
|
BASE_BRANCH="preview/base/${FORK_OWNER}/${BRANCH_NAME}"
|
||||||
|
else
|
||||||
|
# Same-repo PR
|
||||||
|
PREVIEW_BRANCH="preview/${BRANCH_NAME}"
|
||||||
|
BASE_BRANCH="preview/base/${BRANCH_NAME}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "preview_branch=${PREVIEW_BRANCH}" >> $GITHUB_OUTPUT
|
||||||
|
echo "base_branch=${BASE_BRANCH}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
# This action builds preview SDKs from the OpenAPI spec changes and
|
# This action builds preview SDKs from the OpenAPI spec changes and
|
||||||
# posts/updates a comment on the PR with build results and links to the preview.
|
# posts/updates a comment on the PR with build results and links to the preview.
|
||||||
- name: Run preview builds
|
- name: Run preview builds
|
||||||
|
|
@ -73,6 +97,8 @@ jobs:
|
||||||
base_sha: ${{ github.event.pull_request.base.sha }}
|
base_sha: ${{ github.event.pull_request.base.sha }}
|
||||||
base_ref: ${{ github.event.pull_request.base.ref }}
|
base_ref: ${{ github.event.pull_request.base.ref }}
|
||||||
head_sha: ${{ github.event.pull_request.head.sha }}
|
head_sha: ${{ github.event.pull_request.head.sha }}
|
||||||
|
branch: ${{ steps.branch-names.outputs.preview_branch }}
|
||||||
|
base_branch: ${{ steps.branch-names.outputs.base_branch }}
|
||||||
|
|
||||||
merge:
|
merge:
|
||||||
if: github.event.action == 'closed' && github.event.pull_request.merged == true
|
if: github.event.action == 'closed' && github.event.pull_request.merged == true
|
||||||
|
|
@ -90,12 +116,33 @@ jobs:
|
||||||
ref: ${{ github.event.pull_request.head.sha }}
|
ref: ${{ github.event.pull_request.head.sha }}
|
||||||
fetch-depth: 2
|
fetch-depth: 2
|
||||||
|
|
||||||
|
# Compute the Stainless branch name, prefixing with fork owner if PR is from a fork.
|
||||||
|
# For fork PRs like "contributor:fix/issue-123", this creates "preview/contributor/fix/issue-123"
|
||||||
|
# For same-repo PRs, this creates "preview/fix/issue-123"
|
||||||
|
- name: Compute branch names
|
||||||
|
id: branch-names
|
||||||
|
run: |
|
||||||
|
HEAD_REPO="${{ github.event.pull_request.head.repo.full_name }}"
|
||||||
|
BASE_REPO="${{ github.repository }}"
|
||||||
|
BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
|
||||||
|
|
||||||
|
if [ "$HEAD_REPO" != "$BASE_REPO" ]; then
|
||||||
|
# Fork PR: prefix with fork owner for isolation
|
||||||
|
FORK_OWNER="${{ github.event.pull_request.head.repo.owner.login }}"
|
||||||
|
MERGE_BRANCH="preview/${FORK_OWNER}/${BRANCH_NAME}"
|
||||||
|
else
|
||||||
|
# Same-repo PR
|
||||||
|
MERGE_BRANCH="preview/${BRANCH_NAME}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "merge_branch=${MERGE_BRANCH}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
# Note that this only merges in changes that happened on the last build on
|
# Note that this only merges in changes that happened on the last build on
|
||||||
# preview/${{ github.head_ref }}. It's possible that there are OAS/config
|
# the computed preview branch. It's possible that there are OAS/config
|
||||||
# changes that haven't been built, if the preview-sdk job didn't finish
|
# changes that haven't been built, if the preview job didn't finish
|
||||||
# before this step starts. In theory we want to wait for all builds
|
# before this step starts. In theory we want to wait for all builds
|
||||||
# against preview/${{ github.head_ref }} to complete, but assuming that
|
# against the preview branch to complete, but assuming that
|
||||||
# the preview-sdk job happens before the PR merge, it should be fine.
|
# the preview job happens before the PR merge, it should be fine.
|
||||||
- name: Run merge build
|
- name: Run merge build
|
||||||
uses: stainless-api/upload-openapi-spec-action/merge@32823b096b4319c53ee948d702d9052873af485f # 1.6.0
|
uses: stainless-api/upload-openapi-spec-action/merge@32823b096b4319c53ee948d702d9052873af485f # 1.6.0
|
||||||
with:
|
with:
|
||||||
|
|
@ -108,3 +155,4 @@ jobs:
|
||||||
base_sha: ${{ github.event.pull_request.base.sha }}
|
base_sha: ${{ github.event.pull_request.base.sha }}
|
||||||
base_ref: ${{ github.event.pull_request.base.ref }}
|
base_ref: ${{ github.event.pull_request.base.ref }}
|
||||||
head_sha: ${{ github.event.pull_request.head.sha }}
|
head_sha: ${{ github.event.pull_request.head.sha }}
|
||||||
|
merge_branch: ${{ steps.branch-names.outputs.merge_branch }}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue