Tidy up generation of toolchains.xml

This commit is contained in:
daz 2025-01-18 10:27:23 -07:00
parent 8c3e41f260
commit 392620bad1
No known key found for this signature in database

View File

@ -13,34 +13,35 @@ export function readResourceFileAsString(...paths: string[]): string {
* @VisibleForTesting * @VisibleForTesting
*/ */
export function getPredefinedToolchains(): string | null { export function getPredefinedToolchains(): string | null {
const javaHomeEnvs: string[] = [] // Get the version and path for each JAVA_HOME env var
for (const javaHomeEnvsKey in process.env) { const javaHomeEnvs = Object.entries(process.env)
if (javaHomeEnvsKey.startsWith('JAVA_HOME_')) { .filter(([key]) => key.startsWith('JAVA_HOME_') && process.env[key])
javaHomeEnvs.push(javaHomeEnvsKey) .map(([key, _value]) => ({
} jdkVersion: key.match(/JAVA_HOME_(\d+)_/)?.[1] ?? null,
} jdkPath: `\${env.${key}}`
}))
.filter(env => env.jdkVersion !== null)
if (javaHomeEnvs.length === 0) { if (javaHomeEnvs.length === 0) {
return null return null
} }
// language=XML // language=XML
let toolchainsXml = `<?xml version="1.0" encoding="UTF-8"?> return `<?xml version="1.0" encoding="UTF-8"?>
<toolchains> <toolchains>
<!-- JDK Toolchains installed by default on GitHub-hosted runners --> <!-- JDK Toolchains installed by default on GitHub-hosted runners -->
` ${javaHomeEnvs
for (const javaHomeEnv of javaHomeEnvs) { .map(
const version = javaHomeEnv.match(/JAVA_HOME_(\d+)_/)?.[1]! ({jdkVersion, jdkPath}) => ` <toolchain>
toolchainsXml += ` <toolchain>
<type>jdk</type> <type>jdk</type>
<provides> <provides>
<version>${version}</version> <version>${jdkVersion}</version>
</provides> </provides>
<configuration> <configuration>
<jdkHome>\${env.${javaHomeEnv}}</jdkHome> <jdkHome>${jdkPath}</jdkHome>
</configuration> </configuration>
</toolchain>\n` </toolchain>`).join('\n')}
} </toolchains>\n`
toolchainsXml += `</toolchains>\n`
return toolchainsXml
} }
export function mergeToolchainContent(existingToolchainContent: string, preInstalledToolchains: string): string { export function mergeToolchainContent(existingToolchainContent: string, preInstalledToolchains: string): string {