bamanker/setup-graalvm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade musl-toolchain to 1.2.5-oracle-00001.

Browse Source
This commit is contained in:
Fabio Niephaus
2025-10-24 16:23:29 +02:00
committed by Fabio Niephaus
parent 2a24120090
commit 3716035e2a
2 changed files with 6 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dist/main.js generated vendored
View File

@@ -88852,8 +88852,8 @@ function checkForUpdates(graalVMVersion, javaVersion) {
// TODO: add support for JDK-specific update checks (e.g., 17.0.X) // TODO: add support for JDK-specific update checks (e.g., 17.0.X)
} }
const MUSL_NAME = 'x86_64-linux-musl-native'; const MUSL_NAME = 'musl-toolchain';
const MUSL_VERSION = '10.2.1'; const MUSL_VERSION = '1.2.5-oracle-00001';
async function setUpNativeImageMusl() { async function setUpNativeImageMusl() {
if (!IS_LINUX) { if (!IS_LINUX) {
coreExports.warning('musl is only supported on Linux'); coreExports.warning('musl is only supported on Linux');
@@ -88865,23 +88865,9 @@ async function setUpNativeImageMusl() {
} }
else { else {
coreExports.startGroup(`Setting up musl for GraalVM Native Image...`); coreExports.startGroup(`Setting up musl for GraalVM Native Image...`);
const muslDownloadPath = await toolCacheExports.downloadTool(`https://github.com/graalvm/setup-graalvm/releases/download/x86_64-linux-musl-${MUSL_VERSION}/${MUSL_NAME}.tgz`); const muslDownloadPath = await toolCacheExports.downloadTool(`https://gds.oracle.com/download/bfs/archive/musl-toolchain-${MUSL_VERSION}-linux-amd64.tar.gz`);
const muslExtractPath = await toolCacheExports.extractTar(muslDownloadPath); const muslExtractPath = await toolCacheExports.extractTar(muslDownloadPath);
const muslPath = join(muslExtractPath, MUSL_NAME); const muslPath = join(muslExtractPath, MUSL_NAME);
const zlibCommit = 'ec3df00224d4b396e2ac6586ab5d25f673caa4c2';
const zlibDownloadPath = await toolCacheExports.downloadTool(`https://github.com/madler/zlib/archive/${zlibCommit}.tar.gz`);
const zlibExtractPath = await toolCacheExports.extractTar(zlibDownloadPath);
const zlibPath = join(zlibExtractPath, `zlib-${zlibCommit}`);
const zlibBuildOptions = {
cwd: zlibPath,
env: {
...process.env,
CC: join(muslPath, 'bin', 'gcc')
}
};
await exec('./configure', [`--prefix=${muslPath}`, '--static'], zlibBuildOptions);
await exec('make', [], zlibBuildOptions);
await exec('make', ['install'], { cwd: zlibPath });
coreExports.info(`Adding ${MUSL_NAME} ${MUSL_VERSION} to tool-cache ...`); coreExports.info(`Adding ${MUSL_NAME} ${MUSL_VERSION} to tool-cache ...`);
toolPath = await toolCacheExports.cacheDir(muslPath, MUSL_NAME, MUSL_VERSION); toolPath = await toolCacheExports.cacheDir(muslPath, MUSL_NAME, MUSL_VERSION);
coreExports.endGroup(); coreExports.endGroup();

23
src/features/musl.ts
View File

@@ -1,11 +1,10 @@
import * as c from '../constants.js' import * as c from '../constants.js'
import * as core from '@actions/core' import * as core from '@actions/core'
import * as tc from '@actions/tool-cache' import * as tc from '@actions/tool-cache'
import { exec } from '../utils.js'
import { join } from 'path' import { join } from 'path'
const MUSL_NAME = 'x86_64-linux-musl-native' const MUSL_NAME = 'musl-toolchain'
const MUSL_VERSION = '10.2.1' const MUSL_VERSION = '1.2.5-oracle-00001'
export async function setUpNativeImageMusl(): Promise<void> { export async function setUpNativeImageMusl(): Promise<void> {
if (!c.IS_LINUX) { if (!c.IS_LINUX) {
@@ -18,26 +17,10 @@ export async function setUpNativeImageMusl(): Promise<void> {
} else { } else {
core.startGroup(`Setting up musl for GraalVM Native Image...`) core.startGroup(`Setting up musl for GraalVM Native Image...`)
const muslDownloadPath = await tc.downloadTool( const muslDownloadPath = await tc.downloadTool(
`https://github.com/graalvm/setup-graalvm/releases/download/x86_64-linux-musl-${MUSL_VERSION}/${MUSL_NAME}.tgz` `https://gds.oracle.com/download/bfs/archive/musl-toolchain-${MUSL_VERSION}-linux-amd64.tar.gz`
) )
const muslExtractPath = await tc.extractTar(muslDownloadPath) const muslExtractPath = await tc.extractTar(muslDownloadPath)
const muslPath = join(muslExtractPath, MUSL_NAME) const muslPath = join(muslExtractPath, MUSL_NAME)
const zlibCommit = 'ec3df00224d4b396e2ac6586ab5d25f673caa4c2'
const zlibDownloadPath = await tc.downloadTool(`https://github.com/madler/zlib/archive/${zlibCommit}.tar.gz`)
const zlibExtractPath = await tc.extractTar(zlibDownloadPath)
const zlibPath = join(zlibExtractPath, `zlib-${zlibCommit}`)
const zlibBuildOptions = {
cwd: zlibPath,
env: {
...process.env,
CC: join(muslPath, 'bin', 'gcc')
}
}
await exec('./configure', [`--prefix=${muslPath}`, '--static'], zlibBuildOptions)
await exec('make', [], zlibBuildOptions)
await exec('make', ['install'], { cwd: zlibPath })
core.info(`Adding ${MUSL_NAME} ${MUSL_VERSION} to tool-cache ...`) core.info(`Adding ${MUSL_NAME} ${MUSL_VERSION} to tool-cache ...`)
toolPath = await tc.cacheDir(muslPath, MUSL_NAME, MUSL_VERSION) toolPath = await tc.cacheDir(muslPath, MUSL_NAME, MUSL_VERSION)
core.endGroup() core.endGroup()