diff --git a/.github/workflows/reintegrate-master.yml b/.github/workflows/reintegrate-master.yml index b6896e4c00..2c26634e09 100644 --- a/.github/workflows/reintegrate-master.yml +++ b/.github/workflows/reintegrate-master.yml @@ -5,6 +5,9 @@ on: branches: - master +env: + REINTEGRATE_BRANCH_NAME: reintegrate-main + jobs: reintegrate-master: runs-on: ubuntu-latest @@ -14,11 +17,32 @@ jobs: uses: actions/checkout@v2 with: submodules: true - - name: pull-request - uses: repo-sync/pull-request@v2 - with: - destination_branch: "develop" - pr_title: "Reintegrate Master" - pr_reviewer: "thoniTUB,awildturtok" - pr_assignee: "thoniTUB,awildturtok" - github_token: ${{ secrets.GITHUB_TOKEN }} + - name: Configure git + run: | + git config user.name 'github-actions[bot]' + git config user.email 'github-actions[bot]@users.noreply.github.com' + git config push.autoSetupRemote true + - name: Switch to intermediate branch + run: git checkout -b $REINTEGRATE_BRANCH_NAME + - name: Push intermediate Branch + run: git push -f + - name: Create pull-request + run: > + gh pr create + -l automated + -a awildturtok,thoniTUB + -r awildturtok,thoniTUB + -B develop + --title "Reintegrate Main" + --head $REINTEGRATE_BRANCH_NAME + --fill + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Modify pull request + run: > + gh pr merge + --merge + --auto + --delete-branch + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file