fix: avoid old LLVM release HTTP redirects

aminya · Sep 19, 2024 · b33732d · b33732d
1 parent fb2a9a2
commit b33732d
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/dist/legacy/setup-cpp.js b/dist/legacy/setup-cpp.js
diff --git a/dist/legacy/setup-cpp.js.map b/dist/legacy/setup-cpp.js.map
diff --git a/dist/modern/setup-cpp.mjs b/dist/modern/setup-cpp.mjs
diff --git a/dist/modern/setup-cpp.mjs.map b/dist/modern/setup-cpp.mjs.map
diff --git a/src/llvm/assets-list.ts b/src/llvm/assets-list.ts
@@ -21,7 +21,9 @@ async function main() {
       for (let major = 1; major <= 9; major++) {
         for (let minor = 0; minor <= 9; minor++) {
           for (let patch = 0; patch <= 9; patch++) {
-            const version = `${major}.${minor}.${patch}`
+            const version = (major >= 3 && minor >= 4 && patch >= 1)
+              ? `${major}.${minor}`
+              : `${major}.${minor}.${patch}`
             yield [version, `https://releases.llvm.org/${version}`] as [string, string]
           }
         }

diff --git a/src/llvm/llvm_url.ts b/src/llvm/llvm_url.ts
@@ -71,7 +71,7 @@ export async function getLLVMAssetURL(platform: string, arch: string, version: s
   )
 
   if (websiteAsset !== undefined) {
-    return `https://llvm.org/releases/${websiteAsset.tag}/${websiteAsset.name}`
+    return `https://releases.llvm.org/${websiteAsset.tag}/${websiteAsset.name}`
   }
 
   throw new Error(`No asset found for version ${version} matching ${keywords} and ${optionalKeywords}`)