Merge pull request #363 from aminya/linux-arm-ci

ci:  tests and executables for Linux arm + fix Doxygen, Sccache on Linux Arm + fix old LLVM on latest Ubuntu arm + fix apt installation fallbacks to latest

Author: aminya

.github/workflows/CI.yml

@@ -86,6 +86,7 @@ jobs:
         os:
           - windows-2019
           - ubuntu-20.04
+          - ubuntu-22.04-arm
           - macos-13 # x64
           - macos-14 # arm64
     steps:
@@ -143,7 +144,9 @@ jobs:
         os:
           - windows-2022
           - windows-2019
+          - ubuntu-24.04-arm
           - ubuntu-24.04
+          - ubuntu-22.04-arm
           - ubuntu-22.04
           - ubuntu-20.04
           - macos-15 # arm64

README.md

@@ -75,18 +75,14 @@ Download the executable for your platform from [here](https://github.com/aminya/
 ```shell
 # windows x64
 curl -o ./setup-cpp.exe -LJ "https://github.com/aminya/setup-cpp/releases/download/v1.1.1/setup-cpp-x64-windows.exe"
-
 # linux x64
 curl -o ./setup-cpp -LJ "https://github.com/aminya/setup-cpp/releases/download/v1.1.1/setup-cpp-x64-linux"
-chmod +x ./setup-cpp
-
+# linux arm64
+curl -o ./setup-cpp -LJ "https://github.com/aminya/setup-cpp/releases/download/v1.1.1/setup-cpp-arm64-linux"
 # macos arm64
 curl -o ./setup-cpp -LJ "https://github.com/aminya/setup-cpp/releases/download/v1.1.1/setup-cpp-arm64-macos"
-chmod +x ./setup-cpp
-
 # macos x64
 curl -o ./setup-cpp -LJ "https://github.com/aminya/setup-cpp/releases/download/v1.1.1/setup-cpp-x64-macos"
-chmod +x ./setup-cpp
 ```
 
 An example that installs llvm, cmake, ninja, ccache, and vcpkg:
@@ -99,6 +95,7 @@ An example that installs llvm, cmake, ninja, ccache, and vcpkg:
 
 ```shell
 # linux/macos example
+chmod +x ./setup-cpp
 sudo ./setup-cpp --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
 source ~/.cpprc # activate cpp environment variables
 ```

dist/legacy/github_brechtsanders_winlibs_mingw.json

@@ -1 +1 @@
-{"ninja":"1.12.1","cmake":"3.31.4","task":"3.40.1","powershell":"7.4.5","pip":">=22.2.0","python":">=3.7.9","meson":{"linux":{"ubuntu":{"20":"1.6.1","18":"0.61.4","else":"0.61.4"},"else":"1.6.1"},"else":"1.6.1"},"kcov":{"linux":{"ubuntu":{"22":"42-binary","20":"40-binary","14":"40","else":"42"},"else":"42"},"else":"42"},"doxygen":{"linux":{"archlinux":"1.12.0-2","ubuntu":{"22":"1.12.0","18":"1.10.0","else":"1.10.0"},"else":"1.12.0"},"else":"1.12.0"},"gcc":{"win32":"14.2.0posix-18.1.8-12.0.0-ucrt-r1","else":""},"mingw":{"win32":"14.2.0posix-18.1.8-12.0.0-ucrt-r1","else":""},"gcovr":{"linux":{"ubuntu":{"20":"","18":"5.0","else":"5.0"},"else":""},"else":""},"nala":{"linux":{"ubuntu":{"22":"","21":"legacy","else":"legacy"},"else":""},"else":""},"llvm":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang++":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang-tidy":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clangtidy":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang-format":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clangformat":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"}}
+{"ninja":"1.12.1","cmake":"3.31.4","task":"3.40.1","powershell":"7.4.5","pip":">=22.2.0","python":">=3.7.9","meson":{"linux":{"ubuntu":{"20":"1.6.1","18":"0.61.4","else":"0.61.4"},"else":"1.6.1"},"else":"1.6.1"},"kcov":{"linux":{"ubuntu":{"22":"42-binary","20":"40-binary","14":"40","else":"42"},"else":"42"},"else":"42"},"doxygen":{"linux":{"archlinux":"1.13.2-1","ubuntu":{"22":"1.13.2","18":"1.10.0","else":"1.10.0"},"else":"1.13.2"},"else":"1.13.2"},"gcc":{"win32":"14.2.0posix-18.1.8-12.0.0-ucrt-r1","else":""},"mingw":{"win32":"14.2.0posix-18.1.8-12.0.0-ucrt-r1","else":""},"gcovr":{"linux":{"ubuntu":{"20":"","18":"5.0","else":"5.0"},"else":""},"else":""},"nala":{"linux":{"ubuntu":{"22":"","21":"legacy","else":"legacy"},"else":""},"else":""},"llvm":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang++":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang-tidy":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clangtidy":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang-format":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clangformat":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"}}

dist/legacy/github_llvm_llvm-project.json

@@ -1 +1 @@
-{"ninja":"1.12.1","cmake":"3.31.4","task":"3.40.1","powershell":"7.4.5","pip":">=22.2.0","python":">=3.7.9","meson":{"linux":{"ubuntu":{"20":"1.6.1","18":"0.61.4","else":"0.61.4"},"else":"1.6.1"},"else":"1.6.1"},"kcov":{"linux":{"ubuntu":{"22":"42-binary","20":"40-binary","14":"40","else":"42"},"else":"42"},"else":"42"},"doxygen":{"linux":{"archlinux":"1.12.0-2","ubuntu":{"22":"1.12.0","18":"1.10.0","else":"1.10.0"},"else":"1.12.0"},"else":"1.12.0"},"gcc":{"win32":"14.2.0posix-18.1.8-12.0.0-ucrt-r1","else":""},"mingw":{"win32":"14.2.0posix-18.1.8-12.0.0-ucrt-r1","else":""},"gcovr":{"linux":{"ubuntu":{"20":"","18":"5.0","else":"5.0"},"else":""},"else":""},"nala":{"linux":{"ubuntu":{"22":"","21":"legacy","else":"legacy"},"else":""},"else":""},"llvm":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang++":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang-tidy":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clangtidy":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang-format":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clangformat":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"}}
+{"ninja":"1.12.1","cmake":"3.31.4","task":"3.40.1","powershell":"7.4.5","pip":">=22.2.0","python":">=3.7.9","meson":{"linux":{"ubuntu":{"20":"1.6.1","18":"0.61.4","else":"0.61.4"},"else":"1.6.1"},"else":"1.6.1"},"kcov":{"linux":{"ubuntu":{"22":"42-binary","20":"40-binary","14":"40","else":"42"},"else":"42"},"else":"42"},"doxygen":{"linux":{"archlinux":"1.13.2-1","ubuntu":{"22":"1.13.2","18":"1.10.0","else":"1.10.0"},"else":"1.13.2"},"else":"1.13.2"},"gcc":{"win32":"14.2.0posix-18.1.8-12.0.0-ucrt-r1","else":""},"mingw":{"win32":"14.2.0posix-18.1.8-12.0.0-ucrt-r1","else":""},"gcovr":{"linux":{"ubuntu":{"20":"","18":"5.0","else":"5.0"},"else":""},"else":""},"nala":{"linux":{"ubuntu":{"22":"","21":"legacy","else":"legacy"},"else":""},"else":""},"llvm":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang++":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang-tidy":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clangtidy":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clang-format":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"},"clangformat":{"darwin":{"else":{"else":{"x64":"15.0.7","else":"18.1.8"}}},"else":"19.1.6"}}

dist/legacy/setup-cpp.js

@@ -1,6 +1,6 @@
 {
   "name": "setup-apt",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Setup apt packages and repositories in Debian/Ubuntu-based distributions",
   "repository": "https://github.com/aminya/setup-cpp",
   "homepage": "https://github.com/aminya/setup-cpp/tree/master/packages/setup-apt",

dist/legacy/setup-cpp.js.map

@@ -1,4 +1,4 @@
-import { warning } from "ci-log"
+import { info } from "ci-log"
 import escapeRegex from "escape-string-regexp"
 import { execa } from "execa"
 import { getAptEnv } from "./apt-env.js"
@@ -37,70 +37,97 @@ export async function qualifiedNeededAptPackage(pack: AptPackage, apt: string =
   return (await isAptPackInstalled(qualified)) ? undefined : qualified
 }
 
-async function aptPackageType(apt: string, name: string, version: string | undefined): Promise<AptPackageType> {
-  if (version !== undefined && version !== "") {
-    const { stdout } = await execa("apt-cache", [
-      "search",
-      "--names-only",
-      `^${escapeRegex(name)}-${escapeRegex(version)}$`,
-    ], { env: getAptEnv(apt), stdio: "pipe" })
-    if (stdout.trim() !== "") {
+async function aptPackageType(
+  apt: string,
+  name: string,
+  version: string | undefined,
+  fallBackToLatest: boolean,
+): Promise<AptPackageType> {
+  const hasVersion = version !== undefined && version !== ""
+  const canFallBackToLatest = !hasVersion || fallBackToLatest
+
+  if (hasVersion) {
+    // check if apt-get search can find the version
+    if (await aptCacheSearchHasPackage(apt, name, version)) {
       return AptPackageType.NameDashVersion
     }
 
-    try {
-      // check if apt-get show can find the version
-      // eslint-disable-next-line @typescript-eslint/no-shadow
-      const { stdout } = await execa("apt-cache", ["show", `${name}=${version}`], { env: getAptEnv(apt) })
-      if (stdout.trim() === "") {
-        return AptPackageType.NameEqualsVersion
-      }
-    } catch {
-      // ignore
+    // check if apt-get show can find the version
+    if (await aptCacheShowHasPackage(apt, `${name}=${version}`)) {
+      return AptPackageType.NameEqualsVersion
     }
   }
 
-  try {
-    const { stdout: showStdout } = await execa("apt-cache", ["show", name], { env: getAptEnv(apt), stdio: "pipe" })
-    if (showStdout.trim() !== "") {
-      return AptPackageType.Name
+  const logFallback = () => {
+    if (hasVersion && fallBackToLatest) {
+      info(`Could not find package ${name} ${version}. Falling back to latest version.`)
     }
-  } catch {
-    // ignore
+  }
+
+  if (canFallBackToLatest && await aptCacheShowHasPackage(apt, name)) {
+    // if the version is undefined or empty, return the name as a package name
+    logFallback()
+    return AptPackageType.Name
   }
 
   // If apt-cache fails, update the repos and try again
   if (!updatedRepos) {
     updateAptReposMemoized(apt)
-    return aptPackageType(apt, name, version)
+    return aptPackageType(apt, name, version, fallBackToLatest)
   }
 
-  if (version === undefined || version === "") {
+  if (canFallBackToLatest) {
     // if the version is undefined or empty, return the name as a package name
+    logFallback()
     return AptPackageType.Name
   }
 
   return AptPackageType.None
 }
 
+async function aptCacheSearchHasPackage(apt: string, name: string, version: string) {
+  try {
+    const { stdout } = await execa("apt-cache", [
+      "search",
+      "--names-only",
+      `^${escapeRegex(name)}-${escapeRegex(version)}$`,
+    ], { env: getAptEnv(apt), stdio: "pipe" })
+    if (stdout.trim() !== "") {
+      return true
+    }
+  } catch {
+    // ignore
+  }
+  return false
+}
+
+async function aptCacheShowHasPackage(apt: string, arg: string) {
+  try {
+    const { stdout } = await execa("apt-cache", ["show", arg], {
+      env: getAptEnv(apt),
+      stdio: "pipe",
+      verbose: true,
+    })
+    if (stdout.trim() !== "") {
+      return true
+    }
+  } catch {
+    // ignore
+  }
+  return false
+}
+
 async function getAptArg(apt: string, pack: AptPackage) {
   const { name, version, fallBackToLatest = false } = pack
 
-  const package_type = await aptPackageType(apt, name, version)
+  const package_type = await aptPackageType(apt, name, version, fallBackToLatest)
   switch (package_type) {
     case AptPackageType.NameDashVersion:
       return `${name}-${version}`
     case AptPackageType.NameEqualsVersion:
       return `${name}=${version}`
     case AptPackageType.Name: {
-      if (version === undefined || version === "") {
-        return name
-      }
-      if (fallBackToLatest) {
-        warning(`Could not find package '${name}' with version '${version}'. Installing the latest version.`)
-        return name
-      }
-      throw new Error(`Could not find package '${name}' with version '${version}'`)
+      return name
     }
     default:
       throw new Error(`Could not find package '${name}' ${version ?? "with unspecified version"}`)

dist/legacy/versions.json

@@ -7,7 +7,10 @@ import { setupBrew } from "../src/index.js"
 
 jest.setTimeout(300000)
 describe("setup-brew", () => {
-  if (process.platform === "win32") {
+  if (
+    process.platform === "win32"
+    || process.platform === "linux" && process.arch !== "x64"
+  ) {
     it.skip("should setup brew", () => {})
     return
   }

dist/modern/github_brechtsanders_winlibs_mingw.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-brew",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Setup brew and brew packages",
   "repository": "https://github.com/aminya/setup-cpp",
   "homepage": "https://github.com/aminya/setup-cpp/tree/master/packages/setup-brew",

dist/modern/github_llvm_llvm-project.json

@@ -1,5 +1,6 @@
 import { tmpdir } from "os"
 import { dirname, join } from "path"
+import { warning } from "ci-log"
 import { type AddPathOptions, addPath } from "envosman"
 import { execaSync } from "execa"
 import { DownloaderHelper } from "node-downloader-helper"
@@ -21,9 +22,20 @@ export type SetupBrewOptions = {
   arch?: never
 }
 
+/**
+ * Install brew
+ *
+ * @param options - Options for adding the brew path to the rc file
+ * @returns The path to the bin directory of brew if brew is installed, otherwise undefined if brew is not supported on the current platform
+ */
 export async function setupBrew(options: SetupBrewOptions = {}): Promise<InstallationInfo | undefined> {
-  // brew is only available on darwin and linux
-  if (!["darwin", "linux"].includes(process.platform)) {
+  if (
+    // brew is only available on darwin and linux
+    !["darwin", "linux"].includes(process.platform)
+    // brew is only supported on Linux x64
+    || (process.platform === "linux" && process.arch !== "x64")
+  ) {
+    warning(`Brew is not supported on ${process.platform} ${process.arch}`)
     return undefined
   }
 

dist/modern/setup-cpp.mjs

@@ -0,0 +1,27 @@
+import { basename, dirname } from "path"
+import { execa } from "execa"
+import glob from "fast-glob"
+
+async function main() {
+  // create a github token from gh
+  const token = await execa("gh", ["auth", "token"])
+  process.env.GITHUB_TOKEN = token.stdout
+
+  const files = await glob("src/*/assets-list.ts", {
+    onlyFiles: true,
+    absolute: true,
+    ignore: ["node_modules"],
+  })
+
+  await Promise.all(files.map(async (file) => {
+    console.log(`Updating ${basename(dirname(file))}`)
+
+    const jsFile = file.replace(".ts", ".js")
+    await import(jsFile)
+  }))
+}
+
+main().catch((err) => {
+  console.error(err)
+  process.exit(1)
+})

dist/modern/setup-cpp.mjs.map

@@ -4,6 +4,12 @@ import { setupBazel } from "../bazel.js"
 
 jest.setTimeout(300000)
 describe("setup-bazel", () => {
+  if (process.platform === "linux" && process.arch === "arm64") {
+    it("should skip bazel tests on Linux arm64", () => {
+      expect(true).toBe(true)
+    })
+    return
+  }
   it("should setup bazel", async () => {
     const installInfo = await setupBazel("", "", process.arch)
 

dist/modern/versions.json

@@ -1,6 +1,7 @@
-import { execRootSync } from "admina"
+import { execRoot } from "admina"
 import { addAptKeyViaURL, installAptPack } from "setup-apt"
 import { installBrewPack } from "setup-brew"
+import { getDebArch } from "../utils/env/arch.js"
 import { hasDnf } from "../utils/env/hasDnf.js"
 import { isArch } from "../utils/env/isArch.js"
 import { isUbuntu } from "../utils/env/isUbuntu.js"
@@ -24,17 +25,19 @@ export async function setupBazel(version: string, _setupDir: string, _arch: stri
       } else if (hasDnf()) {
         // https://bazel.build/install/redhat
         await setupDnfPack([{ name: "dnf-plugins-core" }])
-        execRootSync("dnf", ["copr", "enable", "vbatts/bazel"])
+        await execRoot("dnf", ["copr", "enable", "vbatts/bazel"])
         return setupDnfPack([{ name: "bazel4" }])
       } else if (isUbuntu()) {
         // https://bazel.build/install/ubuntu
         const keyFileName = await addAptKeyViaURL({
           fileName: "bazel-archive-keyring.gpg",
           keyUrl: "https://bazel.build/bazel-release.pub.gpg",
         })
-        execRootSync("bash", [
+        await execRoot("bash", [
           "-c",
-          `echo "deb [arch=amd64 signed-by=${keyFileName}] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list`,
+          `echo "deb [arch=${
+            getDebArch(process.arch)
+          } signed-by=${keyFileName}] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list`,
         ])
         return installAptPack([{ name: "bazel", version }], true)
       }