From 0fed7d987d080770edc68fe2f9cc858e83d3913f Mon Sep 17 00:00:00 2001 From: Chris Roche Date: Tue, 21 Nov 2023 09:30:09 -0800 Subject: [PATCH 1/4] Group dependabot version updates --- .github/dependabot.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6ac4c317e..60ef9a1cb 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,24 +4,42 @@ updates: directory: / schedule: interval: weekly + groups: + github-actions: + patterns: ["*"] - package-ecosystem: gomod directory: / schedule: interval: weekly + groups: + go: + patterns: ["*"] - package-ecosystem: gomod directory: /tests schedule: interval: weekly + go-tests: + github-actions: + patterns: ["*"] - package-ecosystem: maven directory: /java schedule: interval: weekly open-pull-requests-limit: 40 + groups: + java: + patterns: ["*"] - package-ecosystem: pip directory: / schedule: interval: weekly + groups: + python-root: + patterns: ["*"] - package-ecosystem: pip directory: /python schedule: interval: weekly + groups: + python: + patterns: ["*"] From 4d76be424303e3bbfd19d70518dfca8206eb6410 Mon Sep 17 00:00:00 2001 From: Chris Roche Date: Tue, 21 Nov 2023 11:41:25 -0800 Subject: [PATCH 2/4] checkpoint --- .../src/main/java/io/envoyproxy/pgv/validation/JavaHarness.java | 1 + 1 file changed, 1 insertion(+) diff --git a/java/pgv-java-validation/src/main/java/io/envoyproxy/pgv/validation/JavaHarness.java b/java/pgv-java-validation/src/main/java/io/envoyproxy/pgv/validation/JavaHarness.java index 41c54dfcc..1cc1ced3b 100644 --- a/java/pgv-java-validation/src/main/java/io/envoyproxy/pgv/validation/JavaHarness.java +++ b/java/pgv-java-validation/src/main/java/io/envoyproxy/pgv/validation/JavaHarness.java @@ -71,6 +71,7 @@ private static void writeResult(Harness.TestResult result) { result.writeTo(System.out); } catch (IOException ex) { ex.printStackTrace(); + System.exit(1) } } } From 4ef7ba71f00515811a4d3b2d14463555b2da2c74 Mon Sep 17 00:00:00 2001 From: Chris Roche Date: Tue, 21 Nov 2023 12:46:44 -0800 Subject: [PATCH 3/4] checkpoint --- .../src/main/java/io/envoyproxy/pgv/validation/JavaHarness.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/pgv-java-validation/src/main/java/io/envoyproxy/pgv/validation/JavaHarness.java b/java/pgv-java-validation/src/main/java/io/envoyproxy/pgv/validation/JavaHarness.java index 1cc1ced3b..2d7bd087f 100644 --- a/java/pgv-java-validation/src/main/java/io/envoyproxy/pgv/validation/JavaHarness.java +++ b/java/pgv-java-validation/src/main/java/io/envoyproxy/pgv/validation/JavaHarness.java @@ -71,7 +71,7 @@ private static void writeResult(Harness.TestResult result) { result.writeTo(System.out); } catch (IOException ex) { ex.printStackTrace(); - System.exit(1) + System.exit(1); } } } From 8e20e5afb1d4f8de968b87ac5894a73b292815cc Mon Sep 17 00:00:00 2001 From: Chris Roche Date: Tue, 21 Nov 2023 13:13:49 -0800 Subject: [PATCH 4/4] temporarily disable java bazel tests --- python/setup.cfg | 2 +- tests/harness/executor/BUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/setup.cfg b/python/setup.cfg index de52c2dd1..155a38076 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -30,4 +30,4 @@ data = validate.proto [flake8] max-line-length = 120 ignore = - F401 # unused imports + F401 diff --git a/tests/harness/executor/BUILD b/tests/harness/executor/BUILD index a31da180a..9993ab817 100644 --- a/tests/harness/executor/BUILD +++ b/tests/harness/executor/BUILD @@ -61,5 +61,5 @@ go_binary( shard_count = 5, deps = ["@bazel_tools//tools/bash/runfiles"], ) - for lang in ("cc", "go", "java", "python") + for lang in ("cc", "go", "python") ]