Skip to content

Commit

Permalink
Merge pull request #296 from aminya/llvm-urls [skip ci]
Browse files Browse the repository at this point in the history
fix: avoid old LLVM release HTTP redirects + fix libtinfo5 installation on Ubuntu 24
  • Loading branch information
aminya authored Sep 19, 2024
2 parents fb2a9a2 + 2a2a8eb commit 1f6f832
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 7 deletions.
2 changes: 1 addition & 1 deletion dist/legacy/setup-cpp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/legacy/setup-cpp.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/modern/setup-cpp.mjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/modern/setup-cpp.mjs.map

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions src/llvm/__tests__/llvm.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,23 @@ describe("setup-llvm", () => {
execaSync(main_exe, { cwd: dirname, stdio: "inherit" })
})

it("should setup LLVM 5 from llvm.org", async () => {
const { binDir } = await setupLLVM("5", directory, process.arch)
await testBin("clang++", ["--version"], binDir)

expect(process.env.CC?.includes("clang")).toBeTruthy()
expect(process.env.CXX?.includes("clang++")).toBeTruthy()

// test compilation
const file = join(dirname, "main.cpp")
const main_exe = join(dirname, addExeExt("main"))
execaSync("clang++", ["-std=c++17", file, "-o", main_exe], { cwd: dirname })
if (process.platform !== "win32") {
await chmod(main_exe, "755")
}
execaSync(main_exe, { cwd: dirname, stdio: "inherit" })
})

it("should setup clang-format", async () => {
const osVersion = await ubuntuVersion()
const { binDir } = await setupClangFormat(getVersion("llvm", "true", osVersion), directory, process.arch)
Expand Down
4 changes: 3 additions & 1 deletion src/llvm/assets-list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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]
}
}
Expand Down
26 changes: 25 additions & 1 deletion src/llvm/llvm.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
import { tmpdir } from "os"
import path, { delimiter, join } from "path"
import { fileURLToPath } from "url"
import { execRootSync } from "admina"
import { GITHUB_ACTIONS } from "ci-info"
import { info, warning } from "ci-log"
import { addEnv } from "envosman"
import memoize from "memoizee"
import { DownloaderHelper } from "node-downloader-helper"
import { pathExists } from "path-exists"
import { addExeExt } from "patha"
import { addUpdateAlternativesToRc, installAptPack } from "setup-apt"
import { rcOptions } from "../cli-options.js"
import { setupGcc } from "../gcc/gcc.js"
import { setupMacOSSDK } from "../macos-sdk/macos-sdk.js"
import { arm64, x86_64 } 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"
Expand Down Expand Up @@ -87,7 +91,27 @@ function majorLLVMVersion(version: string) {
async function llvmBinaryDeps_(majorVersion: number) {
if (isUbuntu()) {
if (majorVersion <= 10) {
await installAptPack([{ name: "libtinfo5" }])
try {
await installAptPack([{ name: "libtinfo5" }])
} catch (err) {
// Manually install libtinfo5 if the package is not available
info(`Failed to install libtinfo5 ${err}\nManually installing the package`)
const arch = x86_64.includes(process.arch)
? "amd64"
: arm64.includes(process.arch)
? "arm64"
: process.arch

const fileName = `libtinfo5_6.3-2ubuntu0.1_${arch}.deb`
const url = `http://launchpadlibrarian.net/666971015/${fileName}`
const dl = new DownloaderHelper(url, tmpdir(), { fileName })
dl.on("error", (dlErr) => {
throw new Error(`Failed to download ${url}: ${dlErr}`)
})
await dl.start()
// Install the downloaded package via dpkg
execRootSync("dpkg", ["-i", join(tmpdir(), fileName)])
}
} else {
await installAptPack([{ name: "libtinfo-dev" }])
}
Expand Down
2 changes: 1 addition & 1 deletion src/llvm/llvm_url.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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}`)
Expand Down

0 comments on commit 1f6f832

Please sign in to comment.