Skip to content

Commit

Permalink
images: Update llvm -> 16.0.0
Browse files Browse the repository at this point in the history
Signed-off-by: Ryan Northey <ryan@synca.io>
  • Loading branch information
phlax committed Mar 8, 2024
1 parent fd22fd4 commit 5193e4f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
8 changes: 4 additions & 4 deletions docker/linux/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG ANDROID_CLI_TOOLS=https://dl.google.com/android/repository/commandlinetools-
BAZELISK_SHA256SUM=ce52caa51ef9e509fb6b7e5ad892e5cf10feb0794b0aed4d2f36adb00a1a2779 \
BAZELISK_SHA256SUM_ARM64=6070bf70915e92b3a5ce8eee6f4a8a0968bb350be2a98b80b0fd2fc13ce8a254 \
BAZELISK_VERSION=1.18.0 \
CLANG_TOOLS_SHA256SUM=92b1714294efe13906d3b3f87d3273ea9eb38cb7f3b78631820086f0b0173b25 \
CLANG_TOOLS_SHA256SUM=430fadf6b4b287686e7043792e4defc4b54a4911d02bda540aa5acf63a0de5fa \
DEBIAN_FRONTEND=noninteractive \
LANG=en_US.utf8 \
LCOV_VERSION=1.15 \
Expand All @@ -18,10 +18,10 @@ ARG ANDROID_CLI_TOOLS=https://dl.google.com/android/repository/commandlinetools-
LLVM_DISTRO_ARM64=aarch64-linux-gnu \
LLVM_DISTRO_PPC64LE=powerpc64le-linux-ubuntu-18.04 \
LLVM_DOWNLOAD_PREFIX=https://github.com/llvm/llvm-project/releases/download/llvmorg- \
LLVM_SHA256SUM=38bc7f5563642e73e69ac5626724e206d6d539fbef653541b34cae0ba9c3f036 \
LLVM_SHA256SUM_ARM64=8ca4d68cf103da8331ca3f35fe23d940c1b78fb7f0d4763c1c059e352f5d1bec \
LLVM_SHA256SUM=2b8a69798e8dddeb57a186ecac217a35ea45607cb2b3cf30014431cff4340ad1 \
LLVM_SHA256SUM_ARM64=b750ba3120e6153fc5b316092f19b52cf3eb64e19e5f44bd1b962cb54a20cf0a \
LLVM_SHA256SUM_PPC64LE=7fc9f07ff0fcf191df93fe4adc1da555e43f62fe1d3ddafb15c943f72b1bda17 \
LLVM_VERSION=15.0.6 \
LLVM_VERSION=16.0.0 \
ZULU_INSTALL_DEB=https://cdn.azul.com/zulu/bin/zulu-repo_1.0.0-3_all.deb
ENV LANG=$LANG
SHELL ["/bin/bash", "-ec"]
Expand Down
6 changes: 1 addition & 5 deletions docker/linux/ubuntu/fun.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ COMMON_PACKAGES=(
ca-certificates
gnupg2
gpg-agent
libtinfo5
unzip
wget
xz-utils)
Expand Down Expand Up @@ -80,11 +81,6 @@ UBUNTU_PACKAGES=(
zip)


if [[ "$ARCH" == "aarch64" ]]; then
COMMON_PACKAGES+=(libtinfo5)
fi


# This is not currently used
add_ubuntu_keys () {
apt-get update -y
Expand Down
4 changes: 2 additions & 2 deletions docker/windows/docker_windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ AddToPath C:\tools\ninja

# LLVM to ensure a 64-bit build of the tool (VS BuildTools ships a 32-bit build)
DownloadAndCheck $env:TEMP\LLVM-win64.exe `
https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/LLVM-15.0.6-win64.exe `
22e2f2c38be4c44db7a1e9da5e67de2a453c5b4be9cf91e139592a63877ac0a2
https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/LLVM-16.0.0-win64.exe `
e41295133d6d24cc8133702768ddb4e3bffd9f9b4a9b2faf9cd0a045cfc90abc
RunAndCheckError $env:TEMP\LLVM-win64.exe @("/S") $true
AddToPath $env:ProgramFiles\LLVM\bin

Expand Down

0 comments on commit 5193e4f

Please sign in to comment.