diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index f70d24812086..502f5d8987d9 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -1,22 +1,22 @@ # This workflow will merge pull requests automatically # -#name: automerge -#on: -# check_suite: -# types: -# - completed +name: automerge +on: + check_suite: + types: + - completed -#jobs: -# automerge: -# if: github.event.check_suite.app.name == 'Azure Pipelines' && github.event.check_suite.conclusion == 'success' -# runs-on: ubuntu-latest -# steps: -# - name: automerge -# uses: 'pascalgn/automerge-action@v0.13.1' -# env: -# GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' -# MERGE_LABELS: 'automerge' -# MERGE_METHOD: 'squash' -# MERGE_FILTER_AUTHOR: 'mssonicbld' -# MERGE_DELETE_BRANCH: true +jobs: + automerge: + if: github.event.check_suite.app.name == 'Azure Pipelines' && github.event.check_suite.conclusion == 'success' + runs-on: ubuntu-latest + steps: + - name: automerge + uses: 'pascalgn/automerge-action@v0.13.1' + env: + GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' + MERGE_LABELS: 'automerge' + MERGE_METHOD: 'squash' + MERGE_FILTER_AUTHOR: 'mssonicbld' + MERGE_DELETE_BRANCH: true diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml index cda758527333..f8ae8e7199a2 100644 --- a/.github/workflows/label.yml +++ b/.github/workflows/label.yml @@ -20,6 +20,6 @@ jobs: label: runs-on: ubuntu-latest steps: - #- uses: actions/labeler@main - # with: - # repo-token: "${{ secrets.GITHUB_TOKEN }}" + - uses: actions/labeler@main + with: + repo-token: "${{ secrets.GITHUB_TOKEN }}"