From 66de6347e607ed280616d2fdbfd8ffd7d6344797 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Wed, 20 Aug 2025 00:06:43 -0700 Subject: [PATCH 1/3] Apply yamlfmt --- .github/workflows/ci.yml | 76 +++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 40 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94d02710..c1227a5d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,55 +1,51 @@ # This workflow will build a Java project with Gradle # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle - name: Continuous Integration - on: push: branches: '*' pull_request: - branches: [ main ] + branches: [main] schedule: - cron: "0 7 * * *" - jobs: build: runs-on: ubuntu-latest strategy: matrix: - java: [ 11, 17 ] - + java: [11, 17] steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1 - with: - distribution: 'zulu' - java-version: ${{ matrix.java }} - - name: Cache Gradle Home files - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 - continue-on-error: true - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-home-examples-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }} - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build with Gradle - run: ./gradlew build jacocoTestReport --info - - name: Upload to Sonatype - if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.java == '11' - run: | - echo "${{ secrets.MAVEN_GPG_PRIVATE_KEY }}" > ~/.gradle/secring.gpg.b64 - base64 -d ~/.gradle/secring.gpg.b64 > ~/.gradle/secring.gpg - ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -PsonatypeUsername=${SONATYPE_USERNAME} -PsonatypePassword=${SONATYPE_PASSWORD} -Psigning.keyId=${GPG_KEYID} -Psigning.secretKeyRingFile=$(echo ~/.gradle/secring.gpg) -Psigning.password=${GPG_PASSWORD} - env: - GPG_KEYID: ${{ secrets.MAVEN_GPG_KEYID }} - GPG_PASSWORD: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - - name: Upload coverate to CodeClimate - uses: paambaati/codeclimate-action@f429536ee076d758a24705203199548125a28ca7 # v9.0.0 - env: - CC_TEST_REPORTER_ID: 9c22853d2ecf28aec51c1b578072031a3a655790cffb9fecfed6101920e5446c - JACOCO_SOURCE_PATH: "${{github.workspace}}/src/main/java" - with: - coverageLocations: ${{github.workspace}}/build/reports/jacoco/test/jacocoTestReport.xml:jacoco + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1 + with: + distribution: 'zulu' + java-version: ${{ matrix.java }} + - name: Cache Gradle Home files + uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 + continue-on-error: true + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-home-examples-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }} + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build jacocoTestReport --info + - name: Upload to Sonatype + if: github.event_name == 'push' && github.ref == 'refs/heads/main' && matrix.java == '11' + run: | + echo "${{ secrets.MAVEN_GPG_PRIVATE_KEY }}" > ~/.gradle/secring.gpg.b64 + base64 -d ~/.gradle/secring.gpg.b64 > ~/.gradle/secring.gpg + ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -PsonatypeUsername=${SONATYPE_USERNAME} -PsonatypePassword=${SONATYPE_PASSWORD} -Psigning.keyId=${GPG_KEYID} -Psigning.secretKeyRingFile=$(echo ~/.gradle/secring.gpg) -Psigning.password=${GPG_PASSWORD} + env: + GPG_KEYID: ${{ secrets.MAVEN_GPG_KEYID }} + GPG_PASSWORD: ${{ secrets.MAVEN_GPG_PASSPHRASE }} + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + - name: Upload coverate to CodeClimate + uses: paambaati/codeclimate-action@f429536ee076d758a24705203199548125a28ca7 # v9.0.0 + env: + CC_TEST_REPORTER_ID: 9c22853d2ecf28aec51c1b578072031a3a655790cffb9fecfed6101920e5446c + JACOCO_SOURCE_PATH: "${{github.workspace}}/src/main/java" + with: + coverageLocations: ${{github.workspace}}/build/reports/jacoco/test/jacocoTestReport.xml:jacoco From 8d30e54bc5874a2ea22d5362d85702e68f2f3bb7 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Tue, 19 Aug 2025 23:06:32 -0700 Subject: [PATCH 2/3] Use qlty coverage action during build --- .github/workflows/ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c1227a5d..c75a0e66 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,10 +42,9 @@ jobs: GPG_PASSWORD: ${{ secrets.MAVEN_GPG_PASSPHRASE }} SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - - name: Upload coverate to CodeClimate - uses: paambaati/codeclimate-action@f429536ee076d758a24705203199548125a28ca7 # v9.0.0 - env: - CC_TEST_REPORTER_ID: 9c22853d2ecf28aec51c1b578072031a3a655790cffb9fecfed6101920e5446c - JACOCO_SOURCE_PATH: "${{github.workspace}}/src/main/java" + - name: Upload coverate to Qlty + uses: qltysh/qlty-action/coverage@a19242102d17e497f437d7466aa01b528537e899 # v2.2.0 with: - coverageLocations: ${{github.workspace}}/build/reports/jacoco/test/jacocoTestReport.xml:jacoco + token: ${{ secrets.QLTY_COVERAGE_TOKEN }} + format: jacoco + files: ${{ github.workspace }}/build/reports/jacoco/test/jacocoTestReport.xml From 622babe7d84d01875d7e1f8bd56d54f9b41211da Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Tue, 19 Aug 2025 23:30:31 -0700 Subject: [PATCH 3/3] Fix some syntax problems Also add the schema for the Yaml while we are at it to prevent it in the future. --- .github/workflows/ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c75a0e66..648f9623 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,9 +1,8 @@ -# This workflow will build a Java project with Gradle -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle +# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json name: Continuous Integration on: push: - branches: '*' + branches: ['*'] pull_request: branches: [main] schedule: @@ -26,7 +25,7 @@ jobs: continue-on-error: true with: path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-home-examples-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }} + key: ${{ runner.os }}-gradle-home-examples-check-${{ hashFiles('**/*.gradle') }} - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle @@ -42,7 +41,7 @@ jobs: GPG_PASSWORD: ${{ secrets.MAVEN_GPG_PASSPHRASE }} SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - - name: Upload coverate to Qlty + - name: Upload coverage to Qlty uses: qltysh/qlty-action/coverage@a19242102d17e497f437d7466aa01b528537e899 # v2.2.0 with: token: ${{ secrets.QLTY_COVERAGE_TOKEN }}