From 1aaba3adc438450b3d8d7420a9cef79b1e1d0424 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 2 Sep 2022 10:54:27 +0100 Subject: [PATCH] remove merge of prod branch into main after release --- .github/workflows/release.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8492f08..708d1a3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -375,15 +375,6 @@ jobs: target_branch: ${{ steps.release-branch.outputs.branch_name }} github_token: ${{ github.token }} message: merged ${{ steps.commit-vars.outputs.sha_short }} - # Merge main back to production - - name: Merge prod -> main - uses: devmasx/merge-branch@master - with: - type: now - from_branch: ${{ steps.release-branch.outputs.branch_name }} - target_branch: main - github_token: ${{ github.token }} - message: merged ${{ steps.commit-vars.outputs.sha_short }} # Add wheels to release # Placed after everything to avoid issues if failure (see issue #19) - name: Upload Windows wheel release assets