Skip to content

Commit 25eca9d

Browse files
authored
Merge pull request #6460 from oasisprotocol/kostko/feature/rust-2026-02-11
2 parents 7fe1cbb + 2738bb7 commit 25eca9d

File tree

17 files changed

+837
-659
lines changed

17 files changed

+837
-659
lines changed

.buildkite/code.pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ steps:
254254
# Needed as the trust-root test rebuilds the enclave with embedded trust root data.
255255
- cargo install --locked --path tools
256256
- export CFLAGS_x86_64_fortanix_unknown_sgx="-isystem/usr/include/x86_64-linux-gnu -mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening"
257-
- export CC_x86_64_fortanix_unknown_sgx=clang-11
257+
- export CC_x86_64_fortanix_unknown_sgx=clang-18
258258
# Only run runtime scenarios as others do not use SGX.
259259
- >
260260
.buildkite/scripts/test_e2e.sh --timeout 20m

.buildkite/rust/build_runtime.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ pushd $src_dir
5858

5959
# Build SGX runtime.
6060
export CFLAGS_x86_64_fortanix_unknown_sgx="-isystem/usr/include/x86_64-linux-gnu -mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening"
61-
export CC_x86_64_fortanix_unknown_sgx=clang-11
61+
export CC_x86_64_fortanix_unknown_sgx=clang-18
6262
unset OASIS_UNSAFE_SKIP_KM_POLICY
6363
CARGO_TARGET_DIR="${CARGO_TARGET_DIR}/sgx" cargo build --release --locked --target x86_64-fortanix-unknown-sgx
6464
CARGO_TARGET_DIR="${CARGO_TARGET_DIR}/sgx" cargo elf2sgxs --release

.changelog/6460.internal.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bump Rust toolchain to 2026-02-11

.github/workflows/release-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ env:
2020

2121
jobs:
2222
prepare-dev-release:
23-
runs-on: ubuntu-22.04
23+
runs-on: ubuntu-24.04
2424
steps:
2525
- name: Checkout code
2626
uses: actions/checkout@v5

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ env:
2222

2323
jobs:
2424
prepare-release:
25-
runs-on: ubuntu-22.04
25+
runs-on: ubuntu-24.04
2626
steps:
2727
- name: Checkout code
2828
uses: actions/checkout@v5

0 commit comments

Comments
 (0)