Skip to content

Commit 44efba2

Browse files
authored
Merge pull request #2474 from oasisprotocol/peternose/internal/clang-18
docker/runtime-builder: Use clang-18
2 parents 7dcaaf2 + f2a2086 commit 44efba2

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/actions/hash-rust/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ runs:
6060
TARGET="x86_64-fortanix-unknown-sgx"
6161
export CARGO_TARGET_DIR="$CARGO_TARGET_ROOT/sgx"
6262
export CFLAGS_x86_64_fortanix_unknown_sgx="-isystem/usr/include/x86_64-linux-gnu -mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening"
63-
export CC_x86_64_fortanix_unknown_sgx=clang-11
63+
export CC_x86_64_fortanix_unknown_sgx=clang-18
6464
6565
for pkg in $PKG_DIRS; do
6666
pushd "${pkg}"

docker/runtime-builder/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
# Package versions.
4-
ARG GO_VERSION=1.22.0
4+
ARG GO_VERSION=1.26.4
55
ARG RUST_NIGHTLY_VERSION
66
ARG OASIS_CORE_COMMIT
7-
ARG FORTANIX_TOOLS_VERSION=0.5.1
8-
ARG SGXS_TOOLS_VERSION=0.8.6
7+
ARG FORTANIX_TOOLS_VERSION=0.6.3
8+
ARG SGXS_TOOLS_VERSION=0.9.4
99

1010
ARG DEBIAN_FRONTEND=noninteractive
1111

1212
RUN apt-get update -qq && apt-get upgrade -qq && apt-get install -qq \
13-
git gcc curl jq pkg-config libssl-dev protobuf-compiler libclang-dev clang-11 gcc-multilib cmake && \
13+
git gcc curl jq pkg-config libssl-dev protobuf-compiler libclang-dev clang-18 gcc-multilib cmake && \
1414
apt-get autoclean && apt-get autoremove && rm -rf /var/cache/apt/archives/* && \
1515
mkdir -p /src /cargo/.rustup
1616

0 commit comments

Comments
 (0)