diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml index 3e7925cb5a..4ce35eb43d 100644 --- a/.github/workflows/release-publish.yml +++ b/.github/workflows/release-publish.yml @@ -256,15 +256,15 @@ jobs: # with: # username: ${{ (github.event_name == 'workflow_dispatch' && github.actor) || 'insomnia-infra' }} - # - name: Merge git branch into develop - # run: | - # remote_repo="https://${GITHUB_ACTOR}:${RELEASE_GH_TOKEN}@github.com/${GITHUB_REPOSITORY}.git" - # git checkout develop - # git merge --no-ff ${{ env.RELEASE_BRANCH }} - # git status - # git push "${remote_repo}" - # env: - # RELEASE_GH_TOKEN: ${{ secrets.RELEASE_GH_TOKEN }} + - name: Merge git branch into develop + run: | + remote_repo="https://${GITHUB_ACTOR}:${RELEASE_GH_TOKEN}@github.com/${GITHUB_REPOSITORY}.git" + git checkout develop + git merge --no-ff ${{ env.RELEASE_BRANCH }} + git status + git push "${remote_repo}" + env: + RELEASE_GH_TOKEN: ${{ secrets.RELEASE_GH_TOKEN }} artifact-provenance: needs: [publish]