From d63849281024a3b2efbf6d21672d38a6fd8ce181 Mon Sep 17 00:00:00 2001 From: "Siyao (Jane) He" Date: Tue, 10 Dec 2024 11:11:21 +0800 Subject: [PATCH 1/4] when { not { branch '4.x' } } --- Jenkinsfile-asf | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile-asf b/Jenkinsfile-asf index 0217d0455d..cd82af9f65 100644 --- a/Jenkinsfile-asf +++ b/Jenkinsfile-asf @@ -31,6 +31,7 @@ pipeline { stages { stage('Matrix') { + when { not { branch '4.x' } } matrix { axes { axis { From bdea694c662150b15c1e05e484a545f1ae2b95dd Mon Sep 17 00:00:00 2001 From: "Siyao (Jane) He" Date: Tue, 10 Dec 2024 17:50:15 +0800 Subject: [PATCH 2/4] revert when not --- Jenkinsfile-asf | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile-asf b/Jenkinsfile-asf index cd82af9f65..0217d0455d 100644 --- a/Jenkinsfile-asf +++ b/Jenkinsfile-asf @@ -31,7 +31,6 @@ pipeline { stages { stage('Matrix') { - when { not { branch '4.x' } } matrix { axes { axis { From ae16592b672d4d9ddce711aad2c3a90f4eb62392 Mon Sep 17 00:00:00 2001 From: "Siyao (Jane) He" Date: Thu, 19 Dec 2024 21:10:17 +0800 Subject: [PATCH 3/4] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 53857383cf..ae5d2711bb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,7 +23,7 @@ under the License. ### Java -We follow the [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html). See +Test. We follow the [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html). See https://github.com/google/google-java-format for IDE plugins. The rules are not configurable. The build will fail if the code is not formatted. To format all files from the command line, run: From 3451f2eb23162aa1eddf50373e3259ed1aa9f619 Mon Sep 17 00:00:00 2001 From: "Siyao (Jane) He" Date: Sat, 21 Dec 2024 22:24:58 +0800 Subject: [PATCH 4/4] Update CONTRIBUTING.md --- CONTRIBUTING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ae5d2711bb..c226d4cb4b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,7 +23,8 @@ under the License. ### Java -Test. We follow the [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html). See +Test. +We follow the [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html). See https://github.com/google/google-java-format for IDE plugins. The rules are not configurable. The build will fail if the code is not formatted. To format all files from the command line, run: