diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 27dbe17..1d1fa03 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -19,8 +19,8 @@ jobs: - name: Validate Gradle Wrapper uses: gradle/wrapper-validation-action@v1 - name: Enable auto-merge - if: ${{ github.event_name == 'pull_request' && github.actor == 'wbrawner' }} - run: gh pr merge --auto --merge "$PR_URL" + if: ${{ github.event_name == 'pull_request' && github.actor == 'dependabot' }} + run: gh pr merge --auto --rebase "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} @@ -74,4 +74,4 @@ jobs: - name: Run UI tests uses: gradle/gradle-build-action@v2 with: - arguments: runFlank \ No newline at end of file + arguments: runFlank