feat: find LLVM assets based on platform/arch/version heuristics

Author: aminya

cspell.config.yaml

@@ -13,11 +13,11 @@ ignorePaths:
   - patches/*.patch
   - "**/github_*.json"
   - "**/llvm_org_releases.json"
-
 words:
   - aarch
   - aminya
   - applellvm
+  - armv
   - bazel
   - bazelisk
   - biome

dist/legacy/setup-cpp.js

@@ -1,7 +1,7 @@
 import { parseArgs } from "../cli-options.js"
 import { getCompilerInfo } from "../compilers.js"
 import type { Inputs } from "../tool.js"
-import { DefaultLinuxVersion } from "../versions/default_versions.js"
+import { DefaultUbuntuVersion } from "../versions/default_versions.js"
 import { getVersion, syncVersions } from "../versions/versions.js"
 
 jest.setTimeout(300000)
@@ -55,18 +55,18 @@ describe("getVersion", () => {
   it("gcovr", () => {
     expect(getVersion("gcovr", "5.0")).toBe("5.0")
     if (process.platform === "linux") {
-      expect(getVersion("gcovr", "true", [22, 4])).toBe(DefaultLinuxVersion.gcovr![22])
-      expect(getVersion("gcovr", "true", [20, 4])).toBe(DefaultLinuxVersion.gcovr![20])
-      expect(getVersion("gcovr", "true", [18, 4])).toBe(DefaultLinuxVersion.gcovr![18])
+      expect(getVersion("gcovr", "true", [22, 4])).toBe(DefaultUbuntuVersion.gcovr![22])
+      expect(getVersion("gcovr", "true", [20, 4])).toBe(DefaultUbuntuVersion.gcovr![20])
+      expect(getVersion("gcovr", "true", [18, 4])).toBe(DefaultUbuntuVersion.gcovr![18])
     }
   })
 
   it("llvm", () => {
     expect(getVersion("llvm", "13.0.0")).toBe("13.0.0")
     if (process.platform === "linux") {
-      expect(getVersion("llvm", "true", [20, 4])).toBe(DefaultLinuxVersion.llvm![20])
-      expect(getVersion("llvm", "true", [18, 4])).toBe(DefaultLinuxVersion.llvm![18])
-      expect(getVersion("llvm", "true", [16, 4])).toBe(DefaultLinuxVersion.llvm![16])
+      expect(getVersion("llvm", "true", [20, 4])).toBe(DefaultUbuntuVersion.llvm![20])
+      expect(getVersion("llvm", "true", [18, 4])).toBe(DefaultUbuntuVersion.llvm![18])
+      expect(getVersion("llvm", "true", [16, 4])).toBe(DefaultUbuntuVersion.llvm![16])
     }
   })
 })

dist/legacy/setup-cpp.js.map

@@ -48,6 +48,10 @@ async function getGccPackageInfo(version: string, platform: NodeJS.Platform, arc
         },
       )
 
+      if (asset === undefined) {
+        throw new Error(`No asset found for version ${version} and arch ${arch}`)
+      }
+
       return {
         binRelativeDir: "bin/",
         binFileName: addExeExt("g++"),

dist/modern/setup-cpp.mjs

@@ -3,25 +3,16 @@ import { fileURLToPath } from "url"
 import * as io from "@actions/io"
 import { execaSync } from "execa"
 import { chmod } from "fs/promises"
-import { isUrlOnline } from "is-url-online"
 import { addExeExt } from "patha"
 import { ubuntuVersion } from "../../utils/env/ubuntu_version.js"
-import { getSpecificVersionAndUrl } from "../../utils/setup/version.js"
 import { setupTmpDir, testBin } from "../../utils/tests/test-helpers.js"
 import { getVersion } from "../../versions/versions.js"
 import { setupClangFormat, setupClangTools, setupLLVM } from "../llvm.js"
-import { VERSIONS, getLinuxUrl, getUrl } from "../llvm_url.js"
+import { getLLVMAssetURL } from "../llvm_url.js"
 
 const dirname = typeof __dirname === "string" ? __dirname : path.dirname(fileURLToPath(import.meta.url))
 
 jest.setTimeout(400000)
-async function testUrl(version: string) {
-  const [specificVersion, url] = await getSpecificVersionAndUrl(VERSIONS, process.platform, version, getUrl)
-
-  if (!(await isUrlOnline(url))) {
-    throw new Error(`Failed to install Version: ${version} => ${specificVersion} \n URL: ${url}`)
-  }
-}
 
 describe("setup-llvm", () => {
   let directory: string
@@ -31,38 +22,15 @@ describe("setup-llvm", () => {
 
   it("Finds URL for ubuntu version", async () => {
     expect(
-      await getSpecificVersionAndUrl(
-        VERSIONS,
-        "linux",
-        "13.0.0-ubuntu-16.04",
-        (_plantform, version) => getLinuxUrl(version),
-      ),
-    ).toStrictEqual([
-      "13.0.0-ubuntu-16.04",
+      await getLLVMAssetURL("linux", "x86_64", "13.0.0"),
+    ).toStrictEqual(
       "https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/clang+llvm-13.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz",
-    ])
+    )
     expect(
-      await getSpecificVersionAndUrl(
-        VERSIONS,
-        "linux",
-        "13.0.1-ubuntu-18.04",
-        (_plantform, version) => getLinuxUrl(version),
-      ),
-    ).toStrictEqual([
-      "13.0.1-ubuntu-18.04",
+      await getLLVMAssetURL("linux", "x86_64", "13.0.1"),
+    ).toStrictEqual(
       "https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.1/clang+llvm-13.0.1-x86_64-linux-gnu-ubuntu-18.04.tar.xz",
-    ])
-    expect(
-      await getSpecificVersionAndUrl(
-        VERSIONS,
-        "linux",
-        "13.0.0-ubuntu-20.04",
-        (_plantform, version) => getLinuxUrl(version),
-      ),
-    ).toStrictEqual([
-      "13.0.0-ubuntu-20.04",
-      "https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/clang+llvm-13.0.0-x86_64-linux-gnu-ubuntu-20.04.tar.xz",
-    ])
+    )
   })
 
   it("Finds valid LLVM URLs", async () => {
@@ -89,7 +57,7 @@ describe("setup-llvm", () => {
         "5",
         "5.0.0",
         "4",
-      ].map((version) => testUrl(version)),
+      ].map((version) => getLLVMAssetURL(process.platform, process.arch, version)),
     )
   })