Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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()
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 }}


10 changes: 5 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down
2 changes: 0 additions & 2 deletions codecov.yml

This file was deleted.

4 changes: 2 additions & 2 deletions platform-grpc-service-framework/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand All @@ -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")
}
2 changes: 1 addition & 1 deletion platform-http-service-framework/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down