Re-enable automerge
This commit is contained in:
parent
a1f4f3a693
commit
e86427e152
1 changed files with 14 additions and 13 deletions
27
.github/workflows/pull-request.yml
vendored
27
.github/workflows/pull-request.yml
vendored
|
@ -8,14 +8,14 @@ permissions:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
name: Gradle Check
|
name: Build and Test
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Setup Gradle
|
- name: Setup Gradle
|
||||||
uses: gradle/gradle-build-action@v2
|
uses: gradle/gradle-build-action@v2
|
||||||
- name: Run checks with Gradle Wrapper
|
- name: Build with Gradle
|
||||||
run: ./gradlew --no-daemon --no-configuration-cache check
|
run: ./gradlew --no-daemon --no-configuration-cache build
|
||||||
- name: Publish JUnit Results
|
- name: Publish JUnit Results
|
||||||
uses: dorny/test-reporter@v1
|
uses: dorny/test-reporter@v1
|
||||||
if: always()
|
if: always()
|
||||||
|
@ -24,13 +24,14 @@ jobs:
|
||||||
path: "*/build/test-results/test/*.xml"
|
path: "*/build/test-results/test/*.xml"
|
||||||
reporter: java-junit
|
reporter: java-junit
|
||||||
fail-on-error: true
|
fail-on-error: true
|
||||||
# automerge:
|
fail-on-empty: true
|
||||||
# name: Enable automerge
|
automerge:
|
||||||
# runs-on: ubuntu-latest
|
name: Enable automerge
|
||||||
# if: ${{ github.actor == 'wbrawner' }}
|
runs-on: ubuntu-latest
|
||||||
# steps:
|
if: ${{ github.actor == 'wbrawner' }}
|
||||||
# - name: Enable auto-merge
|
steps:
|
||||||
# run: gh pr merge --auto --merge "$PR_URL"
|
- name: Enable auto-merge
|
||||||
# env:
|
run: gh pr merge --auto --merge "$PR_URL"
|
||||||
# PR_URL: ${{github.event.pull_request.html_url}}
|
env:
|
||||||
# GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
|
PR_URL: ${{github.event.pull_request.html_url}}
|
||||||
|
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
|
Loading…
Reference in a new issue