Merge pull request #66 from aminya/llvm-14-0-1 [skip ci]

Author: aminya

dist/setup_cpp.js

@@ -15,7 +15,7 @@
     "build": "shx rm -rf dist/ && shx mkdir ./dist && run-p test.tsc build.parcel copy.matchers",
     "build.docker": "pnpm build && docker build -f ./dev/docker/ubuntu_node.dockerfile -t setup_cpp .",
     "build.parcel": "cross-env NODE_ENV=production parcel build --detailed-report",
-    "bump": "ncu -u -x execa && pnpm update",
+    "bump": "ncu -u -x execa,make-synchronous && pnpm update",
     "clean": "shx rm -rf .parcel-cache dist exe",
     "copy.matchers": "shx cp ./src/gcc/gcc_matcher.json ./dist/ && shx cp ./src/msvc/msvc_matcher.json ./dist && shx cp ./src/python/python_matcher.json ./dist/ && shx cp ./src/llvm/llvm_matcher.json ./dist/ ",
     "dev": "cross-env NODE_ENV=development parcel watch",
@@ -38,12 +38,14 @@
     "@actions/io": "^1.1.2",
     "@actions/tool-cache": "^1.7.2",
     "execa": "^5.1.1",
+    "make-synchronous": "^0.1.1",
     "mri": "^1.2.0",
     "msvc-dev-cmd": "github:aminya/msvc-dev-cmd#9f672c1",
     "numerous": "1.0.3",
     "semver": "7.3.7",
     "setup-python": "github:actions/setup-python#v3.1.2",
     "time-delta": "github:aminya/time-delta#69d91a41cef28e569be9a2991129f5f7d1f0d00e",
+    "ubuntu-version": "^2.0.0",
     "untildify": "^4.0.0",
     "which": "^2.0.2"
   },

dist/setup_cpp.js.map

@@ -1,3 +1,6 @@
+import { warning } from "./utils/io/io"
+import { ubuntuVersion } from "./utils/env/ubuntu_version"
+
 const DefaultVersions: Record<string, string> = {
   llvm: "13.0.0", // https://github.com/llvm/llvm-project/releases
   clangtidy: "13.0.0",
@@ -14,9 +17,28 @@ const DefaultVersions: Record<string, string> = {
   gcc: process.platform === "win32" ? "11.2.0.07112021" : "11", // https://community.chocolatey.org/packages/mingw#versionhistory and // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=gcc
 }
 
+let ubuntuVersionCached: number[] | null = null
+
 /** Get the default version if passed true or undefined, otherwise return the version itself */
 export function getVersion(name: string, version: string | undefined) {
   if (version === "true" || (version === undefined && name in DefaultVersions)) {
+    // llvm on linux
+    if (process.platform === "linux" && ["llvm", "clangtidy", "clangformat"].includes(name)) {
+      try {
+        // get the version if not already done
+        ubuntuVersionCached = ubuntuVersionCached ?? ubuntuVersion()
+      } catch (err) {
+        warning((err as Error).toString())
+        return DefaultVersions[name]
+      }
+      // choose the default version for llvm based on ubuntu
+      if (ubuntuVersionCached !== null) {
+        if ([20, 18, 16].includes(ubuntuVersionCached[0]) && ubuntuVersionCached[1] === 4) {
+          return `-13.0.0-x86_64-linux-gnu-ubuntu-${ubuntuVersionCached[0]}.0${ubuntuVersionCached[1]}`
+        }
+      }
+    }
+    // anything else
     return DefaultVersions[name]
   } else {
     return version ?? ""

package.json

@@ -27,7 +27,7 @@ describe("setup-llvm", () => {
   it("Finds valid LLVM URLs", async () => {
     await Promise.all(
       [
-        // "14.0.1", fails on ubuntu
+        // "14.0.1",
         "14.0.0",
         "13.0.0",
         "12.0.0",

pnpm-lock.yaml

@@ -59,6 +59,8 @@ export const VERSIONS: Set<string> = getVersions([
   "13.0.1",
   "14.0.0",
   "14.0.1",
+  "14.0.2",
+  "14.0.3",
 ])
 
 //================================================
@@ -122,7 +124,8 @@ const UBUNTU_RC: Map<string, string> = new Map()
  *
  * https://github.com/llvm/llvm-project/releases/tag/llvmorg-14.0.1 or https://releases.llvm.org/14.0.1
  */
-const UBUNTU: { [key: string]: string } = {
+// TODO change based on ubuntu version
+const UBUNTU_SUFFIX_MAP: { [key: string]: string } = {
   "3.5.0": "-ubuntu-14.04",
   "3.5.1": "",
   "3.5.2": "-ubuntu-14.04",
@@ -157,7 +160,7 @@ const UBUNTU: { [key: string]: string } = {
   "13.0.0": "-ubuntu-20.04",
   "13.0.1": "-ubuntu-18.04",
   "14.0.0": "-ubuntu-18.04",
-  // "14.0.1": "-ubuntu-18.04",
+  // "14.0.1": "-ubuntu-18.04",  // only available for powerpc64le
 }
 
 /** The latest supported LLVM version for the Linux (Ubuntu) platform. */
@@ -176,11 +179,12 @@ function getLinuxUrl(versionGiven: string): string {
   // ubuntu-version is specified
   if (version.includes("ubuntu")) {
     ubuntu = version
-  } else if (version !== "" && version in UBUNTU) {
-    ubuntu = UBUNTU[version]
+  } else if (version !== "" && version in UBUNTU_SUFFIX_MAP) {
+    ubuntu = UBUNTU_SUFFIX_MAP[version]
   } else {
     // default to the maximum version
-    ubuntu = UBUNTU[MAX_UBUNTU]
+    ubuntu = UBUNTU_SUFFIX_MAP[MAX_UBUNTU]
+    warning(`Falling back to LLVM version ${MAX_UBUNTU} ${ubuntu} for the Ubuntu.`)
   }
 
   const prefix = "clang+llvm-"

src/default_versions.ts

@@ -0,0 +1,16 @@
+import { getUbuntuVersion } from "ubuntu-version"
+import makeSynchronous from "make-synchronous"
+
+export function ubuntuVersion(): number[] | null {
+  if (process.platform === "linux") {
+    const versionSplitted = makeSynchronous(getUbuntuVersion)()
+
+    if (versionSplitted.length === 0) {
+      throw new Error("Failed to get the ubuntu major version.")
+    }
+
+    return versionSplitted
+  } else {
+    return null
+  }
+}