From d054e99c134c46b7c55c6049b357e340c8f050c3 Mon Sep 17 00:00:00 2001 From: Guillaume Berche Date: Fri, 5 Jan 2024 21:20:46 +0100 Subject: [PATCH] add rebase-release-branches-on-master-branch-commits.yml (fixup) list all branches. See https://github.com/actions/checkout/issues/1017#issuecomment-1344861321 --- .../rebase-release-branches-on-master-branch-commits.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rebase-release-branches-on-master-branch-commits.yml b/.github/workflows/rebase-release-branches-on-master-branch-commits.yml index cd8b4309..c5beabdd 100644 --- a/.github/workflows/rebase-release-branches-on-master-branch-commits.yml +++ b/.github/workflows/rebase-release-branches-on-master-branch-commits.yml @@ -16,8 +16,6 @@ jobs: - name: rebase all release branches env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - AWS_BOSH_ACCES_KEY_ID: ${{ secrets.AWS_BOSH_ACCES_KEY_ID }} - AWS_BOSH_SECRET_ACCES_KEY: ${{ secrets.AWS_BOSH_SECRET_ACCES_KEY }} run: | set -x # enable traces @@ -31,8 +29,8 @@ jobs: # Note: actions/checkout does not include local branches, see https://github.com/actions/checkout/issues/1017#issuecomment-1344861321 # therefore we iterate on remote branches - git branch -r --list "release-*" - RELEASE_BRANCHES=$(git branch -r --list "release-*" | grep release) + git branch -a --list "release-*" + RELEASE_BRANCHES=$(git branch -a --list "release-*" | grep release) for r in ${RELEASE_BRANCHES}; do git co $r git pull --rebase origin $r