From eb9e6d85de2a1bcb1f46c70ae9b65fca9c1392e5 Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Thu, 26 Jun 2025 09:29:31 -0400 Subject: [PATCH] chore: update to latest --- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/pr-build.yml | 4 ++-- .github/workflows/pr-test.yml | 16 +++++----------- .github/workflows/publish.yml | 10 +++++----- build.gradle.kts | 10 +++++----- codecov.yml | 2 -- settings.gradle.kts | 4 ++-- 7 files changed, 21 insertions(+), 29 deletions(-) delete mode 100644 codecov.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b1268a4..08e1805 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,7 +13,7 @@ on: jobs: analyze: name: Analyze - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 permissions: actions: read contents: read @@ -26,7 +26,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 55513e4..c5fa121 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -9,11 +9,11 @@ on: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{github.event.pull_request.head.ref}} repository: ${{github.event.pull_request.head.repo.full_name}} diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 366c606..ef288d7 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -7,11 +7,11 @@ on: jobs: test: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -20,14 +20,6 @@ jobs: with: args: build jacocoTestReport - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4 - with: - name: unit test reports - fail_ci_if_error: true - flags: unit - token: ${{ secrets.CODECOV_TOKEN }} - - name: copy test reports uses: hypertrace/github-actions/gradle@main with: @@ -48,8 +40,10 @@ jobs: files: ./**/build/test-results/**/*.xml dependency-check: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Dependency Check uses: hypertrace/github-actions/dependency-check@main + with: + nvd-api-key: ${{ secrets.NVD_API_KEY }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1f76634..e0117bf 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,11 +8,11 @@ on: jobs: publish-artifacts: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -21,8 +21,8 @@ jobs: with: args: publish env: - ORG_GRADLE_PROJECT_artifactory_contextUrl: ${{ secrets.ARTIFACTORY_CONTEXT_URL }} - ORG_GRADLE_PROJECT_artifactory_user: ${{ secrets.ARTIFACTORY_PUBLISH_USER }} - ORG_GRADLE_PROJECT_artifactory_password: ${{ secrets.ARTIFACTORY_PUBLISH_TOKEN }} + ORG_GRADLE_PROJECT_maven_repo_url: ${{ secrets.HAR_REPO_URL }} + ORG_GRADLE_PROJECT_maven_user: ${{ secrets.HAR_PUBLISH_USER }} + ORG_GRADLE_PROJECT_maven_password: ${{ secrets.HAR_PUBLISH_TOKEN }} diff --git a/build.gradle.kts b/build.gradle.kts index 10adac6..871952a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,11 +2,11 @@ import org.hypertrace.gradle.publishing.HypertracePublishExtension import org.hypertrace.gradle.publishing.License plugins { - id("org.hypertrace.repository-plugin") version "0.4.0" - id("org.hypertrace.ci-utils-plugin") version "0.3.2" - id("org.hypertrace.publish-plugin") version "1.0.5" apply false - id("org.hypertrace.jacoco-report-plugin") version "0.2.1" apply false - id("org.hypertrace.code-style-plugin") version "2.0.0" apply false + id("org.hypertrace.repository-plugin") version "0.5.0" + id("org.hypertrace.ci-utils-plugin") version "0.4.0" + id("org.hypertrace.publish-plugin") version "1.1.1" apply false + id("org.hypertrace.jacoco-report-plugin") version "0.3.0" apply false + id("org.hypertrace.code-style-plugin") version "2.1.0" apply false id("org.owasp.dependencycheck") version "12.1.0" } diff --git a/codecov.yml b/codecov.yml deleted file mode 100644 index 8a333e5..0000000 --- a/codecov.yml +++ /dev/null @@ -1,2 +0,0 @@ -codecov: - max_report_age: off diff --git a/settings.gradle.kts b/settings.gradle.kts index 94ab61c..976c820 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,12 +4,12 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() - maven("https://hypertrace.jfrog.io/artifactory/maven") + maven("https://us-maven.pkg.dev/hypertrace-repos/maven") } } plugins { - id("org.hypertrace.version-settings") version "0.2.0" + id("org.hypertrace.version-settings") version "0.3.0" } include(":grpc-client-utils")