diff --git a/.github/workflows/cherry-pick-from-branch.sh b/.github/workflows/cherry-pick-from-branch.sh index 8c53d07..2e63196 100755 --- a/.github/workflows/cherry-pick-from-branch.sh +++ b/.github/workflows/cherry-pick-from-branch.sh @@ -43,4 +43,4 @@ for sha1 in $(git log --reverse --format=format:%H $BEFORE_SHA..$LAST_SHA); do echo "Commit message contains $SKIP_COMMIT_STRING. Skipping..." fi done -# git push "$DEST_REMOTE" "$DEST_BRANCH" +git push "$DEST_REMOTE" "$DEST_BRANCH" diff --git a/.github/workflows/update_upstream_from_fork.yml b/.github/workflows/update_upstream_from_fork.yml index 6a9995f..5043458 100644 --- a/.github/workflows/update_upstream_from_fork.yml +++ b/.github/workflows/update_upstream_from_fork.yml @@ -10,7 +10,7 @@ on: env: GH_TOKEN: ${{ secrets.SYNC_TEST_ADMIN }} GH_REPO: ${{ github.repository }} - BASE_REF: ${{ github.event.base_ref}} # TODO this isn't populated + BRANCH_REF: ${{ github.ref_name }} REF: ${{ github.event.REF}} BEFORE_SHA: ${{ github.event.before }} LAST_SHA: ${{ github.event.after}} @@ -54,7 +54,7 @@ jobs: shell: bash - name: Cherry pick from origin to upstream run: | - .github/workflows/cherry-pick-from-branch.sh upstream master "$BEFORE_SHA" "$LAST_SHA" + .github/workflows/cherry-pick-from-branch.sh upstream "$BRANCH_REF" "$BEFORE_SHA" "$LAST_SHA" shell: bash # TODO master is hardcoded in script call above. # TODO Minimize the PAT permissions