Skip to content

Commit

Permalink
Run constraint branch checkout in non-canary build (#35088)
Browse files Browse the repository at this point in the history
The constraint branch checkout needs to happen always when there
is an "upgrade-to-newer-dependencies" build, not only wnen there
is a "canary" main build, Otherwise when we attempt to update to
diff constraints vs. the current ones the diff fails.

Only the Commit and Push which are the folowing steps should
happen exclusively in the canary run.

(cherry picked from commit 570d88b)
  • Loading branch information
potiuk committed Oct 29, 2023
1 parent 4a9641d commit 67c8fee
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1728,10 +1728,8 @@ jobs:
- name: "Set constraints branch name"
id: constraints-branch
run: ./scripts/ci/constraints/ci_branch_constraints.sh >> ${GITHUB_OUTPUT}
if: needs.build-info.outputs.canary-run == 'true'
- name: Checkout ${{ steps.constraints-branch.outputs.branch }}
uses: actions/checkout@v3
if: needs.build-info.outputs.canary-run == 'true'
with:
path: "repo"
ref: ${{ steps.constraints-branch.outputs.branch }}
Expand Down

0 comments on commit 67c8fee

Please sign in to comment.