From 514099346eefc93b09efefc675f718d034eb6cd0 Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Thu, 26 Jun 2025 17:09:02 -0400 Subject: [PATCH 1/2] ci: update repos --- .github/workflows/build-and-test.yml | 14 +++----------- .github/workflows/publish.yml | 10 +++++----- build.gradle.kts | 10 +++++----- codecov.yml | 2 -- platform-grpc-service-framework/build.gradle.kts | 4 ++-- platform-http-service-framework/build.gradle.kts | 2 +- settings.gradle.kts | 4 ++-- 7 files changed, 18 insertions(+), 28 deletions(-) delete mode 100644 codecov.yml diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index f08fb12..f25bb49 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -9,11 +9,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 @@ -22,14 +22,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 if: failure() @@ -50,7 +42,7 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} 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 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d6a54f8..c2874a9 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 800f27c..93d838b 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.2" apply false - id("org.hypertrace.jacoco-report-plugin") version "0.2.1" apply false - id("org.hypertrace.code-style-plugin") version "1.1.2" 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.2" 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/platform-grpc-service-framework/build.gradle.kts b/platform-grpc-service-framework/build.gradle.kts index d08787d..217ba24 100644 --- a/platform-grpc-service-framework/build.gradle.kts +++ b/platform-grpc-service-framework/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { api(platform("io.grpc:grpc-bom:1.68.3")) api("io.grpc:grpc-api") api("io.grpc:grpc-services") - api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.10") + api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.14") api("com.typesafe:config:1.4.2") api("com.google.protobuf:protobuf-java:3.25.5") api(project(":service-framework-spi")) @@ -22,5 +22,5 @@ dependencies { implementation("io.grpc:grpc-inprocess") implementation("io.grpc:grpc-netty") implementation("org.slf4j:slf4j-api:1.7.36") - implementation("org.hypertrace.core.grpcutils:grpc-server-utils:0.13.10") + implementation("org.hypertrace.core.grpcutils:grpc-server-utils:0.13.14") } diff --git a/platform-http-service-framework/build.gradle.kts b/platform-http-service-framework/build.gradle.kts index 8f00b47..475a5c3 100644 --- a/platform-http-service-framework/build.gradle.kts +++ b/platform-http-service-framework/build.gradle.kts @@ -5,7 +5,7 @@ plugins { dependencies { api(project(":platform-service-framework")) - api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.10") + api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.14") api("com.typesafe:config:1.4.2") api("jakarta.servlet:jakarta.servlet-api:6.0.0") api("com.google.inject:guice:7.0.0") diff --git a/settings.gradle.kts b/settings.gradle.kts index 651dfb6..b5ed956 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(":platform-grpc-service-framework") From e35c31f9a0117de15d510a563ac0769ede2ade28 Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Thu, 26 Jun 2025 17:19:50 -0400 Subject: [PATCH 2/2] ci: force rerun