diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 5804c29..1cc4339 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,6 +1,6 @@ name: Java CI -on: [push] +on: [push, pull_request] jobs: build: @@ -40,7 +40,7 @@ jobs: - name: Sign jars env: SIGNING_KEY: ${{ secrets.VIOLET_MOON_SIGNING_KEY }} - if: ${{ env.SIGNING_KEY != '' } + if: ${{ env.SIGNING_KEY != '' }} run: | echo "${SIGNING_KEY}" | gpg --import - gpg --local-user "Violet Moon Signing Key" --armor \ diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml deleted file mode 100644 index 602c554..0000000 --- a/.github/workflows/pr.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: Pull Request CI - -on: [pull_request] - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Set up JDK - uses: actions/setup-java@v2 - with: - distribution: 'temurin' - java-version: '17' - - name: Validate gradlew integrity - uses: gradle/wrapper-validation-action@v1 - - name: Cache - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/build.gradle', '**/gradle-wrapper.properties') }} - - name: Build with Gradle - run: ./gradlew pmdMain spotlessJavaCheck build - - name: PMD report - uses: jwgmeligmeyling/pmd-github-action@v1 - if: failure() - with: - path: '**/reports/pmd/main.xml' - - name: Cleanup - run: ./gradlew --stop