From 46c2e92687013cc78bd0ff438a8bdd5e2a8390bb Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 18 Mar 2024 20:45:44 +0800 Subject: [PATCH] add LLVM 18.1.0, 18.1.1 and 18.1.2 specifically, 18.1.2 has not been tagged yet. but its ubuntu packages have been uploaded. so add this version to ubuntu's mapping as well. Fixes #228 Signed-off-by: Kefu Chai --- src/llvm/llvm_url.ts | 9 ++++++++- src/versions/default_versions.ts | 24 ++++++++++++------------ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/llvm/llvm_url.ts b/src/llvm/llvm_url.ts index 3787edd3..06988fca 100644 --- a/src/llvm/llvm_url.ts +++ b/src/llvm/llvm_url.ts @@ -75,6 +75,8 @@ export const VERSIONS: Set = getVersions([ "17.0.4", "17.0.5", "17.0.6", + "18.1.0", + "18.1.1", ]) /** The LLVM versions that were never released for the Windows platform. */ @@ -113,6 +115,8 @@ const DARWIN_MISSING = new Set([ "17.0.4", "17.0.5", "17.0.6", + "18.1.0", + "18.1.1", ]) /** @@ -178,10 +182,13 @@ const UBUNTU_SUFFIX_MAP: { [key: string]: string } = { "17.0.4": "-ubuntu-22.04", "17.0.5": "-ubuntu-22.04", "17.0.6": "-ubuntu-22.04", + "18.1.0": "-ubuntu-22.04", + "18.1.1": "-ubuntu-22.04", + "18.1.2": "-ubuntu-22.04", } /** The latest supported LLVM version for the Linux (Ubuntu) platform. */ -const MAX_UBUNTU: string = "17.0.6" +const MAX_UBUNTU: string = "18.1.2" //================================================ // URL diff --git a/src/versions/default_versions.ts b/src/versions/default_versions.ts index 0f25232b..054f195f 100644 --- a/src/versions/default_versions.ts +++ b/src/versions/default_versions.ts @@ -6,14 +6,14 @@ import { isArch } from "../utils/env/isArch" function getLLVMDefault() { switch (process.platform) { case "win32": - return "17.0.6" + return "18.1.1" case "linux": // used for non-ubuntu (Fedora, Arch) - return "17.0.6-ubuntu-22.04" + return "18.1.2-ubuntu-22.04" case "darwin": return "15.0.3" default: - return "17.0.6" + return "18.1.1" } } @@ -54,23 +54,23 @@ export const DefaultLinuxVersion: Record | undefi 20: "7.0.0-2", }, llvm: { - 22: "17.0.6-ubuntu-22.04", - 20: "17.0.6-ubuntu-22.04", - 18: "15.0.6-ubuntu-18.04", + 22: "18.1.2-ubuntu-22.04", + 20: "18.1.2-ubuntu-20.04", + 18: "18.1.2-ubuntu-18.04", 16: "15.0.6-ubuntu-18.04", 14: "13.0.0-ubuntu-16.04", }, clangtidy: { - 22: "17.0.2-ubuntu-22.04", - 20: "17.0.2-ubuntu-22.04", - 18: "15.0.6-ubuntu-18.04", + 22: "18.1.2-ubuntu-22.04", + 20: "18.1.2-ubuntu-20.04", + 18: "18.1.2-ubuntu-18.04", 16: "15.0.6-ubuntu-18.04", 14: "13.0.0-ubuntu-16.04", }, clangformat: { - 22: "17.0.2-ubuntu-22.04", - 20: "17.0.2-ubuntu-22.04", - 18: "15.0.6-ubuntu-18.04", + 22: "18.1.2-ubuntu-22.04", + 20: "18.1.2-ubuntu-20.04", + 18: "18.1.2-ubuntu-18.04", 16: "15.0.6-ubuntu-18.04", 14: "13.0.0-ubuntu-16.04", },