diff --git a/.github/workflows/merge-master.yml b/.github/workflows/merge-master.yml deleted file mode 100644 index 7847f37..0000000 --- a/.github/workflows/merge-master.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Merge master - -on: - push: - branches: - - master - -jobs: - merge-branch: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@master - - - name: Merge master -> with-net6.0 - uses: devmasx/merge-branch@master - with: - type: now - target_branch: with-net6.0 - github_token: ${{ github.token }} - disable_fastforwards: true - - - name: Merge master -> only-net6.0 - uses: devmasx/merge-branch@master - with: - type: now - target_branch: only-net6.0 - github_token: ${{ github.token }} - disable_fastforwards: true