Skip to content

Commit 6be7e3b

Browse files
HannesWellHannesWell
committed
[I/Y-Build] Indent buildConfiguration.json with tabs instead of spaces
- Aligns to default formatter settings of the Generic Editor - Matches recent indentation style of source files Minor advantages - Simpler indentation and configurable configuration - Smaller file size
1 parent 14150f7 commit 6be7e3b

File tree

2 files changed

+110
-110
lines changed

2 files changed

+110
-110
lines changed

‎JenkinsJobs/buildConfigurations.json‎

Lines changed: 109 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,111 @@
11
{
2-
"I": {
3-
"typeName": "Integration",
4-
"branchLabel": "master",
5-
"streams": {
6-
"4.38": {
7-
"branch": "master",
8-
"schedule": "0 18 * 8-10 *\n0 18 1-26 11 *"
9-
}
10-
},
11-
"mailingList": "[email protected]",
12-
"testJobFolder": "AutomatedTests",
13-
"tests": [
14-
{
15-
"os": "linux",
16-
"ws": "gtk",
17-
"arch": "x86_64",
18-
"javaVersion": 21,
19-
"agentLabel": "ubuntu-2404",
20-
"javaHome": "tool(type:'jdk', name:'temurin-jdk21-latest')"
21-
},
22-
{
23-
"os": "linux",
24-
"ws": "gtk",
25-
"arch": "x86_64",
26-
"javaVersion": 25,
27-
"agentLabel": "ubuntu-2404",
28-
"javaHome": "tool(type:'jdk', name:'openjdk-jdk25-latest')"
29-
},
30-
{
31-
"os": "macosx",
32-
"ws": "cocoa",
33-
"arch": "aarch64",
34-
"javaVersion": 21,
35-
"agentLabel": "nc1ht-macos11-arm64",
36-
"javaHome": "'/Library/Java/JavaVirtualMachines/jdk-21.0.5+11-arm64/Contents/Home'"
37-
},
38-
{
39-
"os": "macosx",
40-
"ws": "cocoa",
41-
"arch": "x86_64",
42-
"javaVersion": 21,
43-
"agentLabel": "nc1ht-macos11-arm64",
44-
"javaHome": "'/Library/Java/JavaVirtualMachines/jdk-21.0.5+11/Contents/Home'"
45-
},
46-
{
47-
"os": "win32",
48-
"ws": "win32",
49-
"arch": "x86_64",
50-
"javaVersion": 21,
51-
"agentLabel": "qa6xd-win11",
52-
"javaHome": "'C:\\\\Program Files\\\\Eclipse Adoptium\\\\jdk-21.0.5.11-hotspot'"
53-
}
54-
]
55-
},
56-
"Y": {
57-
"typeName": "Beta Java 25",
58-
"branchLabel": "java25",
59-
"streams": {
60-
"4.38": {
61-
"branch": "master",
62-
"disabled": "true",
63-
"schedule": "0 10 * 8-10 2,4,6\n0 10 1-26 11 2,4,6"
64-
}
65-
},
66-
"mailingList": "[email protected]",
67-
"testJobFolder": "YBuilds",
68-
"tests": [
69-
{
70-
"os": "linux",
71-
"ws": "gtk",
72-
"arch": "x86_64",
73-
"javaVersion": 21,
74-
"agentLabel": "ubuntu-2404",
75-
"javaHome": "tool(type:'jdk', name:'temurin-jdk21-latest')"
76-
},
77-
{
78-
"os": "linux",
79-
"ws": "gtk",
80-
"arch": "x86_64",
81-
"javaVersion": 25,
82-
"agentLabel": "ubuntu-2404",
83-
"javaHome": "install('jdk', 'https://download.java.net/java/GA/jdk25/bd75d5f9689641da8e1daabeccb5528b/36/GPL/openjdk-25_linux-x64_bin.tar.gz')"
84-
},
85-
{
86-
"os": "macosx",
87-
"ws": "cocoa",
88-
"arch": "aarch64",
89-
"javaVersion": 21,
90-
"agentLabel": "nc1ht-macos11-arm64",
91-
"javaHome": "'/Library/Java/JavaVirtualMachines/jdk-21.0.5+11-arm64/Contents/Home'"
92-
},
93-
{
94-
"os": "macosx",
95-
"ws": "cocoa",
96-
"arch": "x86_64",
97-
"javaVersion": 21,
98-
"agentLabel": "nc1ht-macos11-arm64",
99-
"javaHome": "'/Library/Java/JavaVirtualMachines/jdk-21.0.5+11/Contents/Home'"
100-
},
101-
{
102-
"os": "win32",
103-
"ws": "win32",
104-
"arch": "x86_64",
105-
"javaVersion": 21,
106-
"agentLabel": "qa6xd-win11",
107-
"javaHome": "'C:\\\\Program Files\\\\Eclipse Adoptium\\\\jdk-21.0.5.11-hotspot'"
108-
}
109-
]
110-
}
2+
"I": {
3+
"typeName": "Integration",
4+
"branchLabel": "master",
5+
"streams": {
6+
"4.38": {
7+
"branch": "master",
8+
"schedule": "0 18 * 8-10 *\n0 18 1-26 11 *"
9+
}
10+
},
11+
"mailingList": "[email protected]",
12+
"testJobFolder": "AutomatedTests",
13+
"tests": [
14+
{
15+
"os": "linux",
16+
"ws": "gtk",
17+
"arch": "x86_64",
18+
"javaVersion": 21,
19+
"agentLabel": "ubuntu-2404",
20+
"javaHome": "tool(type:'jdk', name:'temurin-jdk21-latest')"
21+
},
22+
{
23+
"os": "linux",
24+
"ws": "gtk",
25+
"arch": "x86_64",
26+
"javaVersion": 25,
27+
"agentLabel": "ubuntu-2404",
28+
"javaHome": "tool(type:'jdk', name:'openjdk-jdk25-latest')"
29+
},
30+
{
31+
"os": "macosx",
32+
"ws": "cocoa",
33+
"arch": "aarch64",
34+
"javaVersion": 21,
35+
"agentLabel": "nc1ht-macos11-arm64",
36+
"javaHome": "'/Library/Java/JavaVirtualMachines/jdk-21.0.5+11-arm64/Contents/Home'"
37+
},
38+
{
39+
"os": "macosx",
40+
"ws": "cocoa",
41+
"arch": "x86_64",
42+
"javaVersion": 21,
43+
"agentLabel": "nc1ht-macos11-arm64",
44+
"javaHome": "'/Library/Java/JavaVirtualMachines/jdk-21.0.5+11/Contents/Home'"
45+
},
46+
{
47+
"os": "win32",
48+
"ws": "win32",
49+
"arch": "x86_64",
50+
"javaVersion": 21,
51+
"agentLabel": "qa6xd-win11",
52+
"javaHome": "'C:\\\\Program Files\\\\Eclipse Adoptium\\\\jdk-21.0.5.11-hotspot'"
53+
}
54+
]
55+
},
56+
"Y": {
57+
"typeName": "Beta Java 25",
58+
"branchLabel": "java25",
59+
"streams": {
60+
"4.38": {
61+
"branch": "master",
62+
"disabled": "true",
63+
"schedule": "0 10 * 8-10 2,4,6\n0 10 1-26 11 2,4,6"
64+
}
65+
},
66+
"mailingList": "[email protected]",
67+
"testJobFolder": "YBuilds",
68+
"tests": [
69+
{
70+
"os": "linux",
71+
"ws": "gtk",
72+
"arch": "x86_64",
73+
"javaVersion": 21,
74+
"agentLabel": "ubuntu-2404",
75+
"javaHome": "tool(type:'jdk', name:'temurin-jdk21-latest')"
76+
},
77+
{
78+
"os": "linux",
79+
"ws": "gtk",
80+
"arch": "x86_64",
81+
"javaVersion": 25,
82+
"agentLabel": "ubuntu-2404",
83+
"javaHome": "install('jdk', 'https://download.java.net/java/GA/jdk25/bd75d5f9689641da8e1daabeccb5528b/36/GPL/openjdk-25_linux-x64_bin.tar.gz')"
84+
},
85+
{
86+
"os": "macosx",
87+
"ws": "cocoa",
88+
"arch": "aarch64",
89+
"javaVersion": 21,
90+
"agentLabel": "nc1ht-macos11-arm64",
91+
"javaHome": "'/Library/Java/JavaVirtualMachines/jdk-21.0.5+11-arm64/Contents/Home'"
92+
},
93+
{
94+
"os": "macosx",
95+
"ws": "cocoa",
96+
"arch": "x86_64",
97+
"javaVersion": 21,
98+
"agentLabel": "nc1ht-macos11-arm64",
99+
"javaHome": "'/Library/Java/JavaVirtualMachines/jdk-21.0.5+11/Contents/Home'"
100+
},
101+
{
102+
"os": "win32",
103+
"ws": "win32",
104+
"arch": "x86_64",
105+
"javaVersion": 21,
106+
"agentLabel": "qa6xd-win11",
107+
"javaHome": "'C:\\\\Program Files\\\\Eclipse Adoptium\\\\jdk-21.0.5.11-hotspot'"
108+
}
109+
]
110+
}
111111
}

‎JenkinsJobs/shared/utilities.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def modifyJSON(String jsonFilePath, Closure transformation) {
2323
def json = readJSON(file: jsonFilePath)
2424
transformation.call(json)
2525
// This leads to prettier results than using the writeJSON() step, even with the pretty parameter set.
26-
writeFile(file: jsonFilePath, text: JsonOutput.prettyPrint(JsonOutput.toJson(json)), encoding :'UTF-8')
26+
writeFile(file: jsonFilePath, text: JsonOutput.prettyPrint(JsonOutput.toJson(json)).replace(' ','\t'), encoding :'UTF-8')
2727
}
2828

2929
def runHereAndForEachGitSubmodule(Closure task) {

0 commit comments

Comments
 (0)