Skip to content

Commit

Permalink
fix(gha): only bump halyard on master (#6268) (#6270)
Browse files Browse the repository at this point in the history
Since halyard uses a different versioning scheme, it doesn't make sense for halyard to
consume non-master (e.g. release-1.34.x) versions of clouddriver.

(cherry picked from commit 33323d4)

Co-authored-by: David Byron <[email protected]>
  • Loading branch information
mergify[bot] and dbyron-sf committed Aug 17, 2024
1 parent 53606c1 commit 73b6e03
Showing 1 changed file with 24 additions and 0 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,26 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
# Given a tag, determine what branch we are on, so we can bump dependencies (or not)
- name: Get Branch
run: |
BRANCHES=$(git branch -r --contains ${{ github.ref }})
echo "BRANCHES is '${BRANCHES}'"
# Check for no branches explicitly...Otherwise echo adds a newline so wc thinks there's
# one branch. And echo -n makes it appears that there's one less branch than there
# actually is.
if [ -z "$BRANCHES" ]; then
echo "exactly one branch required to release clouddriver, but there are none"
exit 1
fi
NUM_BRANCHES=$(($(echo "$BRANCHES" | wc -l)))
echo "NUM_BRANCHES is '${NUM_BRANCHES}'"
if [ $NUM_BRANCHES -ne 1 ]; then
echo "exactly one branch required to release clouddriver, but there are $NUM_BRANCHES ($BRANCHES)"
exit 1
fi
echo "exactly one branch ($BRANCHES)"
echo BRANCH=$BRANCHES >> $GITHUB_ENV
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
Expand Down Expand Up @@ -150,8 +170,12 @@ jobs:
tag_name: ${{ github.ref }}
token: ${{ secrets.GITHUB_TOKEN }}
- name: Pause before dependency bump
# The only dependency to bump is halyard, which only consumes from
# master since it has a different versioning scheme.
if: env.BRANCH == 'origin/master'
run: sleep 900
- name: Trigger dependency bump workflow
if: env.BRANCH == 'origin/master'
uses: peter-evans/repository-dispatch@v3
with:
token: ${{ secrets.SPINNAKER_GITHUB_TOKEN }}
Expand Down

0 comments on commit 73b6e03

Please sign in to comment.