From 273962e67952d0a3383585c194d29e71f1e38df8 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 17 Dec 2022 12:48:29 +0000 Subject: [PATCH] github/submodule-update: Move back to using our defined `env` We need to run against `develop`, even when on `main` using a cron, so actually use the environment vars we define. --- .github/workflows/submodule-update.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/submodule-update.yml b/.github/workflows/submodule-update.yml index 85f45ff0..79819a67 100644 --- a/.github/workflows/submodule-update.yml +++ b/.github/workflows/submodule-update.yml @@ -25,6 +25,7 @@ jobs: run: | git config user.name github-actions git config user.email github-actions@github.com + git checkout $CHECKOUT_BRANCH git submodule update --remote - name: Check for changes @@ -45,7 +46,7 @@ jobs: - name: Create submodules changes branch if: steps.check_for_changes.outputs.changes == 'true' run: | - git checkout -b "submodule-change/$GITHUB_RUN_ID" + git checkout -b "submodule-change/$GITHUB_RUN_ID" $CHECKOUT_BRANCH git commit -am "updating submodules" git push --set-upstream origin "submodule-change/$GITHUB_RUN_ID" @@ -59,7 +60,7 @@ jobs: owner: '${{ github.repository_owner }}', repo: '${{ github.repository }}'.split('/')[1].trim(), head: 'submodule-change/${{ github.run_id }}', - base: '${{ github.ref }}', + base: '$PR_AGAINST_BRANCH', title: `[Auto-generated] Submodule Updates ${process.env.GITHUB_RUN_ID}`, body: '${{ steps.check_for_changes.outputs.changes_text }}', });