From eecd2c15d2d19e562f53deb7eff641f0c121388e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 18:30:57 -0700 Subject: [PATCH 1/2] Bump the github-actions group with 3 updates (#4506) --- .github/workflows/cifuzz.yml | 2 +- .github/workflows/codeql-analysis.yml | 8 ++++---- .github/workflows/main.yml | 2 +- .github/workflows/win.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml index ad6f28ac97..c401f1b551 100644 --- a/.github/workflows/cifuzz.yml +++ b/.github/workflows/cifuzz.yml @@ -30,7 +30,7 @@ jobs: dry-run: false language: jvm - name: Upload Crash - uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba # v4.3.2 + uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 if: failure() && steps.build.outcome == 'success' with: name: artifacts diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a82ec11c70..e58e894bfc 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -23,16 +23,16 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@c7f9125735019aa87cfc361530512d50ea439c71 # v3.25.1 + uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3 with: languages: ${{ matrix.language }} - name: Autobuild - uses: github/codeql-action/autobuild@c7f9125735019aa87cfc361530512d50ea439c71 # v3.25.1 + uses: github/codeql-action/autobuild@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@c7f9125735019aa87cfc361530512d50ea439c71 # v3.25.1 + uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f50b8d0da2..02117362c1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,7 @@ jobs: env: JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Set up JDK uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml index 85aaaeb42e..1a1da259a3 100644 --- a/.github/workflows/win.yml +++ b/.github/workflows/win.yml @@ -29,7 +29,7 @@ jobs: env: JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Set up JDK uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: From 08517c298c2ce91ce2a31fc22c14a415168c1e59 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 1 May 2024 18:50:59 -0700 Subject: [PATCH 2/2] CI improvements: add Windows build, update to ubuntu 22, streamline publishing (#4510) --- .github/workflows/main.yml | 18 +++++++++++------ .github/workflows/win.yml | 40 -------------------------------------- 2 files changed, 12 insertions(+), 46 deletions(-) delete mode 100644 .github/workflows/win.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 02117362c1..e93e8acfa7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,7 +5,6 @@ on: - master - "3.0" - "2.18" - - "2.17" paths-ignore: - "README.md" - "release-notes/*" @@ -14,7 +13,6 @@ on: - master - "3.0" - "2.18" - - "2.17" paths-ignore: - "README.md" - "release-notes/*" @@ -29,6 +27,13 @@ jobs: matrix: java_version: ['8', '11', '17', '21'] os: ['ubuntu-20.04'] + include: + - java_version: '8' + os: 'ubuntu-20.04' + release_build: 'R' + - java_version: '8' + os: 'windows-latest' + is_windows: 'W' env: JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" steps: @@ -49,22 +54,23 @@ jobs: run: ./mvnw -B -ff -ntp clean verify - name: Extract project Maven version id: projectVersion + if: ${{ !matrix.is_windows }} run: echo "version=$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.3.0:evaluate -DforceStdout -Dexpression=project.version -q)" >> $GITHUB_OUTPUT - name: Verify Android SDK Compatibility - if: matrix.java_version == '8' + if: ${{ matrix.release_build }} run: ./mvnw -B -q -ff -ntp -DskipTests animal-sniffer:check - name: Deploy snapshot - if: github.event_name != 'pull_request' && matrix.java_version == '8' && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT') + if: ${{ github.event_name != 'pull_request' && matrix.release_build && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT') }} env: CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} # MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} run: ./mvnw -B -q -ff -DskipTests -ntp source:jar deploy - name: Generate code coverage - if: github.event_name != 'pull_request' && matrix.java_version == '8' + if: ${{ github.event_name != 'pull_request' && matrix.release_build }} run: ./mvnw -B -q -ff -ntp test - name: Publish code coverage - if: github.event_name != 'pull_request' && matrix.java_version == '8' + if: ${{ github.event_name != 'pull_request' && matrix.release_build }} uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0 with: token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml deleted file mode 100644 index 1a1da259a3..0000000000 --- a/.github/workflows/win.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Build and Test Snapshot (Windows) -on: - push: - branches: - - master - - "3.0" - - "2.17" - paths-ignore: - - "README.md" - - "release-notes/*" - pull_request: - branches: - - master - - "3.0" - - "2.17" - paths-ignore: - - "README.md" - - "release-notes/*" -permissions: - contents: read - -jobs: - build: - runs-on: 'windows-2022' - strategy: - fail-fast: false - matrix: - java_version: ['8'] - env: - JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" - steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - - name: Set up JDK - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 - with: - distribution: 'temurin' - java-version: ${{ matrix.java_version }} - cache: 'maven' - - name: Build - run: cmd /c "mvnw.cmd -B -ff -ntp clean verify"