diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index a8cafb5..0eeac8d 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -8,14 +8,14 @@ permissions: jobs: test: - name: Gradle Check + name: Build and Test runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Setup Gradle uses: gradle/gradle-build-action@v2 - - name: Run checks with Gradle Wrapper - run: ./gradlew --no-daemon --no-configuration-cache check + - name: Build with Gradle + run: ./gradlew --no-daemon --no-configuration-cache build - name: Publish JUnit Results uses: dorny/test-reporter@v1 if: always() @@ -24,13 +24,14 @@ jobs: path: "*/build/test-results/test/*.xml" reporter: java-junit fail-on-error: true -# automerge: -# name: Enable automerge -# runs-on: ubuntu-latest -# if: ${{ github.actor == 'wbrawner' }} -# steps: -# - name: Enable auto-merge -# run: gh pr merge --auto --merge "$PR_URL" -# env: -# PR_URL: ${{github.event.pull_request.html_url}} -# GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file + fail-on-empty: true + automerge: + name: Enable automerge + runs-on: ubuntu-latest + if: ${{ github.actor == 'wbrawner' }} + steps: + - name: Enable auto-merge + run: gh pr merge --auto --merge "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file