Skip to content

Commit df4cd23

Browse files
jameswaldjameswald
committed
Only query for linux_glibc packages
1 parent 0731a04 commit df4cd23

3 files changed

Lines changed: 16 additions & 12 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Currently, the following distributions are supported:
125125

126126
**NOTE:** AdoptOpenJDK got moved to Eclipse Temurin and won't be updated anymore. It is highly recommended to migrate workflows from `adopt` and `adopt-openj9`, to `temurin` and `semeru` respectively, to keep receiving software and security updates. See more details in the [Good-bye AdoptOpenJDK post](https://blog.adoptopenjdk.net/2021/08/goodbye-adoptopenjdk-hello-adoptium/).
127127

128-
**NOTE:** For Azul Zulu OpenJDK, architecture `arm64` is mapped to `aarch64` when querying the Azul Metadata API.
128+
**NOTE:** For Azul Zulu OpenJDK, architecture `arm64` is mapped to `aarch64` and platform `linux` is mapped to `linux_glibc` when querying the Azul Metadata API.
129129

130130
**NOTE:** To comply with the GraalVM Free Terms and Conditions (GFTC) license, it is recommended to use GraalVM JDK 17 version 17.0.12, as this is the only version of GraalVM JDK 17 available under the GFTC license. Additionally, it is encouraged to consider upgrading to GraalVM JDK 21, which offers the latest features and improvements.
131131

‎__tests__/distributors/zulu-linux-installer.test.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ describe('getAvailableVersions', () => {
4646
packageType: 'jdk',
4747
checkLatest: false
4848
},
49-
'?os=linux&archive_type=zip&java_package_type=jdk&javafx_bundled=false&arch=x86&release_status=ga&availability_types=ca&page=1&page_size=100'
49+
'?os=linux_glibc&archive_type=zip&java_package_type=jdk&javafx_bundled=false&arch=x86&release_status=ga&availability_types=ca&page=1&page_size=100'
5050
],
5151
[
5252
{
@@ -55,7 +55,7 @@ describe('getAvailableVersions', () => {
5555
packageType: 'jdk',
5656
checkLatest: false
5757
},
58-
'?os=linux&archive_type=zip&java_package_type=jdk&javafx_bundled=false&arch=x86&release_status=ea&availability_types=ca&page=1&page_size=100'
58+
'?os=linux_glibc&archive_type=zip&java_package_type=jdk&javafx_bundled=false&arch=x86&release_status=ea&availability_types=ca&page=1&page_size=100'
5959
],
6060
[
6161
{
@@ -64,7 +64,7 @@ describe('getAvailableVersions', () => {
6464
packageType: 'jdk',
6565
checkLatest: false
6666
},
67-
'?os=linux&archive_type=zip&java_package_type=jdk&javafx_bundled=false&arch=x64&release_status=ga&availability_types=ca&page=1&page_size=100'
67+
'?os=linux_glibc&archive_type=zip&java_package_type=jdk&javafx_bundled=false&arch=x64&release_status=ga&availability_types=ca&page=1&page_size=100'
6868
],
6969
[
7070
{
@@ -73,7 +73,7 @@ describe('getAvailableVersions', () => {
7373
packageType: 'jre',
7474
checkLatest: false
7575
},
76-
'?os=linux&archive_type=zip&java_package_type=jre&javafx_bundled=false&arch=x64&release_status=ga&availability_types=ca&page=1&page_size=100'
76+
'?os=linux_glibc&archive_type=zip&java_package_type=jre&javafx_bundled=false&arch=x64&release_status=ga&availability_types=ca&page=1&page_size=100'
7777
],
7878
[
7979
{
@@ -82,7 +82,7 @@ describe('getAvailableVersions', () => {
8282
packageType: 'jdk+fx',
8383
checkLatest: false
8484
},
85-
'?os=linux&archive_type=zip&java_package_type=jdk&javafx_bundled=true&arch=x64&release_status=ga&availability_types=ca&page=1&page_size=100'
85+
'?os=linux_glibc&archive_type=zip&java_package_type=jdk&javafx_bundled=true&arch=x64&release_status=ga&availability_types=ca&page=1&page_size=100'
8686
],
8787
[
8888
{
@@ -91,7 +91,7 @@ describe('getAvailableVersions', () => {
9191
packageType: 'jre+fx',
9292
checkLatest: false
9393
},
94-
'?os=linux&archive_type=zip&java_package_type=jre&javafx_bundled=true&arch=x64&release_status=ga&availability_types=ca&page=1&page_size=100'
94+
'?os=linux_glibc&archive_type=zip&java_package_type=jre&javafx_bundled=true&arch=x64&release_status=ga&availability_types=ca&page=1&page_size=100'
9595
],
9696
[
9797
{
@@ -100,7 +100,7 @@ describe('getAvailableVersions', () => {
100100
packageType: 'jdk',
101101
checkLatest: false
102102
},
103-
'?os=linux&archive_type=zip&java_package_type=jdk&javafx_bundled=false&arch=aarch64&release_status=ga&availability_types=ca&page=1&page_size=100'
103+
'?os=linux_glibc&archive_type=zip&java_package_type=jdk&javafx_bundled=false&arch=aarch64&release_status=ga&availability_types=ca&page=1&page_size=100'
104104
],
105105
[
106106
{
@@ -109,11 +109,11 @@ describe('getAvailableVersions', () => {
109109
packageType: 'jdk',
110110
checkLatest: false
111111
},
112-
'?os=linux&archive_type=zip&java_package_type=jdk&javafx_bundled=false&arch=arm&release_status=ga&availability_types=ca&page=1&page_size=100'
112+
'?os=linux_glibc&archive_type=zip&java_package_type=jdk&javafx_bundled=false&arch=arm&release_status=ga&availability_types=ca&page=1&page_size=100'
113113
]
114114
])('build correct url for %s -> %s', async (input, parsedUrl) => {
115115
const distribution = new ZuluDistribution(input);
116-
distribution['getPlatformOption'] = () => 'linux';
116+
distribution['getPlatformOption'] = () => 'linux_glibc';
117117
const buildUrl = `https://api.azul.com/metadata/v1/zulu/packages/${parsedUrl}`;
118118

119119
await distribution['getAvailableVersions']();
@@ -138,10 +138,10 @@ describe('getAvailableVersions', () => {
138138
packageType: 'jdk',
139139
checkLatest: false
140140
});
141-
distribution['getPlatformOption'] = () => 'linux';
141+
distribution['getPlatformOption'] = () => 'linux_glibc';
142142
// Override extension for linux default arch case to match util behavior
143143
spyUtilGetDownloadArchiveExtension.mockReturnValue('tar.gz');
144-
const buildUrl = `https://api.azul.com/metadata/v1/zulu/packages/?os=linux&archive_type=tar.gz&java_package_type=jdk&javafx_bundled=false&arch=${distroArch}&release_status=ga&availability_types=ca&page=1&page_size=100`;
144+
const buildUrl = `https://api.azul.com/metadata/v1/zulu/packages/?os=linux_glibc&archive_type=tar.gz&java_package_type=jdk&javafx_bundled=false&arch=${distroArch}&release_status=ga&availability_types=ca&page=1&page_size=100`;
145145

146146
await distribution['getAvailableVersions']();
147147

‎src/distributions/zulu/installer.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,10 @@ export class ZuluDistribution extends JavaBase {
177177
return 'macos';
178178
case 'win32':
179179
return 'windows';
180+
case 'linux':
181+
// The new Metadata API's "linux" value returns both glibc and musl packages;
182+
// use "linux_glibc" to target only glibc, which is what standard runners use.
183+
return 'linux_glibc';
180184
default:
181185
return process.platform;
182186
}

0 commit comments

Comments
 (0)