From 4430cdbf35bd6fe350ce78c95552e53b23410ff4 Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Wed, 9 Apr 2025 14:15:21 -0400 Subject: [PATCH 1/4] ci: test From ba3b2deb5e46bc66ab7c8b41e7ce280f89362faf Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Wed, 9 Apr 2025 14:25:40 -0400 Subject: [PATCH 2/4] ci: try --- .github/workflows/pr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 6e89ba7b..181c51c9 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -31,7 +31,7 @@ jobs: args: assemble dockerBuildImages - name: Run Trivy vulnerability scanner - uses: hypertrace/github-actions/trivy-image-scan@main + uses: hypertrace/github-actions/trivy-image-scan@try-fix-trivy with: image: hypertrace/config-service output-mode: github From fb71a22cff0dce9f36c803dd627684f0e2830385 Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Wed, 9 Apr 2025 14:29:38 -0400 Subject: [PATCH 3/4] ci: on pr --- .github/workflows/pr-build.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 181c51c9..e49ad620 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -3,7 +3,7 @@ on: push: branches: - main - pull_request_target: + pull_request: branches: - main @@ -19,12 +19,6 @@ jobs: repository: ${{github.event.pull_request.head.repo.full_name}} fetch-depth: 0 - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_READ_USER }} - password: ${{ secrets.DOCKERHUB_READ_TOKEN }} - - name: Build with Gradle uses: hypertrace/github-actions/gradle@main with: From 4464e2420ffb1668594e6664b781fc42849a0a5c Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Wed, 9 Apr 2025 14:45:36 -0400 Subject: [PATCH 4/4] style: fix --- .../service/v1/label_application_rule_config_service.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/label-application-rule-config-service-api/src/main/proto/org/hypertrace/label/application/rule/config/service/v1/label_application_rule_config_service.proto b/label-application-rule-config-service-api/src/main/proto/org/hypertrace/label/application/rule/config/service/v1/label_application_rule_config_service.proto index 4724bd1b..9cca95f2 100644 --- a/label-application-rule-config-service-api/src/main/proto/org/hypertrace/label/application/rule/config/service/v1/label_application_rule_config_service.proto +++ b/label-application-rule-config-service-api/src/main/proto/org/hypertrace/label/application/rule/config/service/v1/label_application_rule_config_service.proto @@ -37,7 +37,7 @@ message GetLabelApplicationRuleResponse { } message GetLabelApplicationRulesRequest { - GetLabelApplicationRuleFilter filter = 1; + GetLabelApplicationRuleFilter filter = 1; } message GetLabelApplicationRuleFilter {