diff --git a/.github/workflows/flex-update.yml b/.github/workflows/flex-update.yml index 005d67e..592037c 100644 --- a/.github/workflows/flex-update.yml +++ b/.github/workflows/flex-update.yml @@ -16,7 +16,7 @@ jobs: contrib: true duplicate-index: - name: Duplicate index.json into main branch + name: Merge updates back into main branch runs-on: Ubuntu-20.04 needs: [call-flex-update] steps: @@ -35,5 +35,7 @@ jobs: - name: Merge updates back into main branch run: | - git merge origin/flex/main - git push main + git branch + git status + git merge origin/flex/main -m "Merge built artifacts" + git push -u origin main