Fix codex P1 issues: Remove TCK filter for EA and use aarch64 for ARM64

Claude · nbauma109 · web-flow · commit bb2f5718380d · 2026-04-04T06:46:54.000Z
- Conditional TCK certification filter: only apply certifications=tck to GA releases, not EA - Change ARM 64-bit arch parameter from arm64 to aarch64 to match API expectations - Update tests to reflect these changes (EA URLs no longer have certifications=tck, ARM64 uses aarch64) Agent-Logs-Url: https://github.com/nbauma109/setup-java/sessions/fd061273-f16e-4ec7-9790-3b46d7823528 Co-authored-by: nbauma109 <9403560+nbauma109@users.noreply.github.com>
diff --git a/__tests__/distributors/zulu-linux-installer.test.ts b/__tests__/distributors/zulu-linux-installer.test.ts
@@ -49,7 +49,7 @@ describe('getAvailableVersions', () => {
         packageType: 'jdk',
         checkLatest: false
       },
-      '?os=linux-glibc&arch=x86&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ea&availability_types=ca&certifications=tck&page=1&page_size=100'
+      '?os=linux-glibc&arch=x86&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ea&availability_types=ca&page=1&page_size=100'
     ],
     [
       {
@@ -94,7 +94,7 @@ describe('getAvailableVersions', () => {
         packageType: 'jdk',
         checkLatest: false
       },
-      '?os=linux-glibc&arch=arm64&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ga&availability_types=ca&certifications=tck&page=1&page_size=100'
+      '?os=linux-glibc&arch=aarch64&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ga&availability_types=ca&certifications=tck&page=1&page_size=100'
     ],
     [
       {
@@ -139,7 +139,7 @@ describe('getAvailableVersions', () => {
       distribution['getPlatformOption'] = () => 'linux';
       // Override extension for linux default arch case to match util behavior
       spyUtilGetDownloadArchiveExtension.mockReturnValue('tar.gz');
-      const expectedArch = distroArch.bitness === '64' && distroArch.arch === 'x86' ? 'x64' : distroArch.bitness === '64' && distroArch.arch === 'arm' ? 'arm64' : distroArch.arch;
+      const expectedArch = distroArch.bitness === '64' && distroArch.arch === 'x86' ? 'x64' : distroArch.bitness === '64' && distroArch.arch === 'arm' ? 'aarch64' : distroArch.arch;
       const buildUrl = `https://api.azul.com/metadata/v1/zulu/packages/?os=linux-glibc&arch=${expectedArch}&archive_type=tar.gz&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ga&availability_types=ca&certifications=tck&page=1&page_size=100`;
 
       await distribution['getAvailableVersions']();
diff --git a/__tests__/distributors/zulu-windows-installer.test.ts b/__tests__/distributors/zulu-windows-installer.test.ts
@@ -49,7 +49,7 @@ describe('getAvailableVersions', () => {
         packageType: 'jdk',
         checkLatest: false
       },
-      '?os=windows&arch=x86&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ea&availability_types=ca&certifications=tck&page=1&page_size=100'
+      '?os=windows&arch=x86&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ea&availability_types=ca&page=1&page_size=100'
     ],
     [
       {
@@ -94,7 +94,7 @@ describe('getAvailableVersions', () => {
         packageType: 'jdk',
         checkLatest: false
       },
-      '?os=windows&arch=arm64&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ga&availability_types=ca&certifications=tck&page=1&page_size=100'
+      '?os=windows&arch=aarch64&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ga&availability_types=ca&certifications=tck&page=1&page_size=100'
     ],
     [
       {
@@ -137,7 +137,7 @@ describe('getAvailableVersions', () => {
         checkLatest: false
       });
       distribution['getPlatformOption'] = () => 'windows';
-      const expectedArch = distroArch.bitness === '64' && distroArch.arch === 'x86' ? 'x64' : distroArch.bitness === '64' && distroArch.arch === 'arm' ? 'arm64' : distroArch.arch;
+      const expectedArch = distroArch.bitness === '64' && distroArch.arch === 'x86' ? 'x64' : distroArch.bitness === '64' && distroArch.arch === 'arm' ? 'aarch64' : distroArch.arch;
       const buildUrl = `https://api.azul.com/metadata/v1/zulu/packages/?os=windows&arch=${expectedArch}&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ga&availability_types=ca&certifications=tck&page=1&page_size=100`;
 
       await distribution['getAvailableVersions']();
diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -114805,7 +114805,9 @@ class ZuluDistribution extends base_installer_1.JavaBase {
                     `crac_supported=${crac}`,
                     `release_status=${releaseStatus}`,
                     `availability_types=ca`,
-                    `certifications=tck`,
+                    // Only filter by TCK certification for GA releases
+                    // EA releases typically don't have TCK certification
+                    releaseStatus === 'ga' ? `certifications=tck` : '',
                     `page=${page}`,
                     `page_size=${pageSize}`
                 ]
@@ -114871,15 +114873,15 @@ class ZuluDistribution extends base_installer_1.JavaBase {
     }
     getArchParam(arch, hw_bitness) {
         // Map architecture to new metadata API arch parameter
-        // The new API uses x64, x86, arm64, arm (not the legacy x86 + hw_bitness pattern)
+        // The new API uses x64, x86, aarch64, arm
         if (arch === 'x86' && hw_bitness === '64') {
             return 'x64';
         }
         else if (arch === 'x86' && hw_bitness === '32') {
             return 'x86';
         }
         else if (arch === 'arm' && hw_bitness === '64') {
-            return 'arm64';
+            return 'aarch64';
         }
         else if (arch === 'arm' && hw_bitness === '') {
             return 'arm';
diff --git a/src/distributions/zulu/installer.ts b/src/distributions/zulu/installer.ts
@@ -133,7 +133,9 @@ export class ZuluDistribution extends JavaBase {
         `crac_supported=${crac}`,
         `release_status=${releaseStatus}`,
         `availability_types=ca`,
-        `certifications=tck`,
+        // Only filter by TCK certification for GA releases
+        // EA releases typically don't have TCK certification
+        releaseStatus === 'ga' ? `certifications=tck` : '',
         `page=${page}`,
         `page_size=${pageSize}`
       ]
@@ -216,13 +218,13 @@ export class ZuluDistribution extends JavaBase {
 
   private getArchParam(arch: string, hw_bitness: string): string {
     // Map architecture to new metadata API arch parameter
-    // The new API uses x64, x86, arm64, arm (not the legacy x86 + hw_bitness pattern)
+    // The new API uses x64, x86, aarch64, arm
     if (arch === 'x86' && hw_bitness === '64') {
       return 'x64';
     } else if (arch === 'x86' && hw_bitness === '32') {
       return 'x86';
     } else if (arch === 'arm' && hw_bitness === '64') {
-      return 'arm64';
+      return 'aarch64';
     } else if (arch === 'arm' && hw_bitness === '') {
       return 'arm';
     }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ describe('getAvailableVersions', () => {`
`49`	`49`	`packageType: 'jdk',`
`50`	`50`	`checkLatest: false`
`51`	`51`	`},`
`52`		`- '?os=linux-glibc&arch=x86&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ea&availability_types=ca&certifications=tck&page=1&page_size=100'`
	`52`	`+ '?os=linux-glibc&arch=x86&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ea&availability_types=ca&page=1&page_size=100'`
`53`	`53`	`],`
`54`	`54`	`[`
`55`	`55`	`{`
`@@ -94,7 +94,7 @@ describe('getAvailableVersions', () => {`
`94`	`94`	`packageType: 'jdk',`
`95`	`95`	`checkLatest: false`
`96`	`96`	`},`
`97`		`- '?os=linux-glibc&arch=arm64&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ga&availability_types=ca&certifications=tck&page=1&page_size=100'`
	`97`	`+ '?os=linux-glibc&arch=aarch64&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ga&availability_types=ca&certifications=tck&page=1&page_size=100'`
`98`	`98`	`],`
`99`	`99`	`[`
`100`	`100`	`{`
`@@ -139,7 +139,7 @@ describe('getAvailableVersions', () => {`
`139`	`139`	`distribution['getPlatformOption'] = () => 'linux';`
`140`	`140`	`// Override extension for linux default arch case to match util behavior`
`141`	`141`	`spyUtilGetDownloadArchiveExtension.mockReturnValue('tar.gz');`
`142`		`- const expectedArch = distroArch.bitness === '64' && distroArch.arch === 'x86' ? 'x64' : distroArch.bitness === '64' && distroArch.arch === 'arm' ? 'arm64' : distroArch.arch;`
	`142`	`+ const expectedArch = distroArch.bitness === '64' && distroArch.arch === 'x86' ? 'x64' : distroArch.bitness === '64' && distroArch.arch === 'arm' ? 'aarch64' : distroArch.arch;`
`143`	`143`	const buildUrl = `https://api.azul.com/metadata/v1/zulu/packages/?os=linux-glibc&arch=${expectedArch}&archive_type=tar.gz&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ga&availability_types=ca&certifications=tck&page=1&page_size=100`;
`144`	`144`
`145`	`145`	`await distribution['getAvailableVersions']();`
Original file line number	Diff line number	Diff line change
`@@ -114805,7 +114805,9 @@ class ZuluDistribution extends base_installer_1.JavaBase {`
`114805`	`114805`	`crac_supported=${crac}`,
`114806`	`114806`	`release_status=${releaseStatus}`,
`114807`	`114807`	`availability_types=ca`,
`114808`		- `certifications=tck`,
	`114808`	`+ // Only filter by TCK certification for GA releases`
	`114809`	`+ // EA releases typically don't have TCK certification`
	`114810`	+ releaseStatus === 'ga' ? `certifications=tck` : '',
`114809`	`114811`	`page=${page}`,
`114810`	`114812`	`page_size=${pageSize}`
`114811`	`114813`	`]`
`@@ -114871,15 +114873,15 @@ class ZuluDistribution extends base_installer_1.JavaBase {`
`114871`	`114873`	`}`
`114872`	`114874`	`getArchParam(arch, hw_bitness) {`
`114873`	`114875`	`// Map architecture to new metadata API arch parameter`
`114874`		`- // The new API uses x64, x86, arm64, arm (not the legacy x86 + hw_bitness pattern)`
	`114876`	`+ // The new API uses x64, x86, aarch64, arm`
`114875`	`114877`	`if (arch === 'x86' && hw_bitness === '64') {`
`114876`	`114878`	`return 'x64';`
`114877`	`114879`	`}`
`114878`	`114880`	`else if (arch === 'x86' && hw_bitness === '32') {`
`114879`	`114881`	`return 'x86';`
`114880`	`114882`	`}`
`114881`	`114883`	`else if (arch === 'arm' && hw_bitness === '64') {`
`114882`		`- return 'arm64';`
	`114884`	`+ return 'aarch64';`
`114883`	`114885`	`}`
`114884`	`114886`	`else if (arch === 'arm' && hw_bitness === '') {`
`114885`	`114887`	`return 'arm';`