From 7b7f7f891cd71bb14002d9e225d55cfeea89d3f4 Mon Sep 17 00:00:00 2001 From: Tim Lai Date: Mon, 14 Dec 2020 11:20:59 -0800 Subject: [PATCH] refactor(GA): move merge-me to eof (#6728) --- .github/workflows/nodejs.yml | 41 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 52cb24b2..47ff5000 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -10,27 +10,6 @@ on: branches: [ master ] jobs: - merge-me: - name: Merge me! - if: github.actor == 'dependabot[bot]' - - runs-on: ubuntu-latest - - needs: [ build, artifact-bundle ] - - strategy: - matrix: - node-version: [ 14.x ] - - steps: - - name: Merge me! - uses: ridedott/merge-me-action@master - with: - GITHUB_LOGIN: dependabot[bot] - GITHUB_TOKEN: ${{ secrets.SWAGGER_BOT_GITHUB_TOKEN }} - MERGE_METHOD: SQUASH - PRESET: DEPENDABOT_MINOR - build: runs-on: ubuntu-latest @@ -82,3 +61,23 @@ jobs: uses: actions/setup-node@v1 with: node-version: 14.x + + merge-me: + name: Merge me! + if: github.actor == 'dependabot[bot]' + runs-on: ubuntu-latest + + needs: [ build, artifact-bundle ] + + strategy: + matrix: + node-version: [ 14.x ] + + steps: + - name: Merge me! + uses: ridedott/merge-me-action@master + with: + GITHUB_LOGIN: dependabot[bot] + GITHUB_TOKEN: ${{ secrets.SWAGGER_BOT_GITHUB_TOKEN }} + MERGE_METHOD: SQUASH + PRESET: DEPENDABOT_MINOR