graalvm/setup-graalvm
1
0
Fork 0
mirror of https://github.com/graalvm/setup-graalvm.git synced 2025-04-11 01:00:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade zlib to latest commit

Browse Source 
This commit will be part of zlib `1.2.12.1` and includes a critical fix for CRC errors that can occur when decompressing files in Java and native executables.

Fixes #10
This commit is contained in:
Fabio Niephaus 2022-04-20 13:15:43 +02:00
parent 5336aa8b95
commit 4f62eae3cc
No known key found for this signature in database
GPG Key ID: F21CF5275F31DFD6
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/index.js generated vendored
View File

@ -168,10 +168,10 @@ function setUpNativeImageMusl() {
const muslDownloadPath = yield tc.downloadTool(`http://more.musl.cc/10/x86_64-linux-musl/${MUSL_NAME}.tgz`); const muslDownloadPath = yield tc.downloadTool(`http://more.musl.cc/10/x86_64-linux-musl/${MUSL_NAME}.tgz`);
const muslExtractPath = yield tc.extractTar(muslDownloadPath); const muslExtractPath = yield tc.extractTar(muslDownloadPath);
const muslPath = (0, path_1.join)(muslExtractPath, MUSL_NAME); const muslPath = (0, path_1.join)(muslExtractPath, MUSL_NAME);
const zlibVersion = '1.2.11'; const zlibCommit = 'ec3df00224d4b396e2ac6586ab5d25f673caa4c2';
const zlibDownloadPath = yield tc.downloadTool(`https://zlib.net/fossils/zlib-${zlibVersion}.tar.gz`); const zlibDownloadPath = yield tc.downloadTool(`https://github.com/madler/zlib/archive/${zlibCommit}.tar.gz`);
const zlibExtractPath = yield tc.extractTar(zlibDownloadPath); const zlibExtractPath = yield tc.extractTar(zlibDownloadPath);
const zlibPath = (0, path_1.join)(zlibExtractPath, `zlib-${zlibVersion}`); const zlibPath = (0, path_1.join)(zlibExtractPath, `zlib-${zlibCommit}`);
const zlibBuildOptions = { const zlibBuildOptions = {
cwd: zlibPath, cwd: zlibPath,
env: Object.assign(Object.assign({}, process.env), { CC: (0, path_1.join)(muslPath, 'bin', 'gcc') }) env: Object.assign(Object.assign({}, process.env), { CC: (0, path_1.join)(muslPath, 'bin', 'gcc') })

2
dist/index.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

6
src/features.ts
View File

@ -23,12 +23,12 @@ export async function setUpNativeImageMusl(): Promise<void> {
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 zlibVersion = '1.2.11' const zlibCommit = 'ec3df00224d4b396e2ac6586ab5d25f673caa4c2'
const zlibDownloadPath = await tc.downloadTool( const zlibDownloadPath = await tc.downloadTool(
`https://zlib.net/fossils/zlib-${zlibVersion}.tar.gz` `https://github.com/madler/zlib/archive/${zlibCommit}.tar.gz`
) )
const zlibExtractPath = await tc.extractTar(zlibDownloadPath) const zlibExtractPath = await tc.extractTar(zlibDownloadPath)
const zlibPath = join(zlibExtractPath, `zlib-${zlibVersion}`) const zlibPath = join(zlibExtractPath, `zlib-${zlibCommit}`)
const zlibBuildOptions = { const zlibBuildOptions = {
cwd: zlibPath, cwd: zlibPath,
env: { env: {