From 8e06ec17eb2c418ce4be04d8191c83c24ec5a790 Mon Sep 17 00:00:00 2001 From: Franziskus Kiefer Date: Mon, 16 Dec 2024 15:32:20 +0100 Subject: [PATCH 1/4] Update ecdh.yml --- .github/workflows/ecdh.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ecdh.yml b/.github/workflows/ecdh.yml index 438386e60..ed13e1135 100644 --- a/.github/workflows/ecdh.yml +++ b/.github/workflows/ecdh.yml @@ -82,9 +82,10 @@ jobs: - name: 🔨 Build Release run: cargo build --verbose --release $RUST_TARGET_FLAG - - name: 🏃🏻 Asan MacOS - if: ${{ matrix.os == 'macos-latest' }} - run: RUSTDOCFLAGS=-Zsanitizer=address RUSTFLAGS=-Zsanitizer=address cargo +nightly test --release --target aarch64-apple-darwin + # https://github.com/cryspen/libcrux/issues/717 + # - name: 🏃🏻 Asan MacOS + # if: ${{ matrix.os == 'macos-latest' }} + # run: RUSTDOCFLAGS=-Zsanitizer=address RUSTFLAGS=-Zsanitizer=address cargo +nightly test --release --target aarch64-apple-darwin # - name: ⬆ Upload build # uses: ./.github/actions/upload_artifacts From eb7013cfac871de516410e6f893aa053b288391f Mon Sep 17 00:00:00 2001 From: Franziskus Kiefer Date: Mon, 16 Dec 2024 15:33:10 +0100 Subject: [PATCH 2/4] Update kem.yml --- .github/workflows/kem.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/kem.yml b/.github/workflows/kem.yml index d4ada3cdf..f25706dff 100644 --- a/.github/workflows/kem.yml +++ b/.github/workflows/kem.yml @@ -82,9 +82,10 @@ jobs: - name: 🔨 Build Release run: cargo build --verbose --release $RUST_TARGET_FLAG - - name: 🏃🏻 Asan MacOS - if: ${{ matrix.os == 'macos-latest' }} - run: RUSTDOCFLAGS=-Zsanitizer=address RUSTFLAGS=-Zsanitizer=address cargo +nightly test --release --target aarch64-apple-darwin + # https://github.com/cryspen/libcrux/issues/717 + # - name: 🏃🏻 Asan MacOS + # if: ${{ matrix.os == 'macos-latest' }} + # run: RUSTDOCFLAGS=-Zsanitizer=address RUSTFLAGS=-Zsanitizer=address cargo +nightly test --release --target aarch64-apple-darwin # - name: ⬆ Upload build # uses: ./.github/actions/upload_artifacts From b5039ee2a029db955de15ef8eb504e3c76317835 Mon Sep 17 00:00:00 2001 From: Jonas Schneider-Bensch Date: Mon, 16 Dec 2024 15:58:12 +0100 Subject: [PATCH 3/4] Use specific nightly version for ASAN macos --- .github/workflows/ecdh.yml | 8 ++++---- .github/workflows/kem.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ecdh.yml b/.github/workflows/ecdh.yml index ed13e1135..53b07b057 100644 --- a/.github/workflows/ecdh.yml +++ b/.github/workflows/ecdh.yml @@ -82,10 +82,10 @@ jobs: - name: 🔨 Build Release run: cargo build --verbose --release $RUST_TARGET_FLAG - # https://github.com/cryspen/libcrux/issues/717 - # - name: 🏃🏻 Asan MacOS - # if: ${{ matrix.os == 'macos-latest' }} - # run: RUSTDOCFLAGS=-Zsanitizer=address RUSTFLAGS=-Zsanitizer=address cargo +nightly test --release --target aarch64-apple-darwin + # TODO: https://github.com/cryspen/libcrux/issues/717 + - name: 🏃🏻 Asan MacOS + if: ${{ matrix.os == 'macos-latest' }} + run: RUSTDOCFLAGS=-Zsanitizer=address RUSTFLAGS=-Zsanitizer=address cargo +nightly-2024-12-14 test --release --target aarch64-apple-darwin # - name: ⬆ Upload build # uses: ./.github/actions/upload_artifacts diff --git a/.github/workflows/kem.yml b/.github/workflows/kem.yml index f25706dff..af4a00d63 100644 --- a/.github/workflows/kem.yml +++ b/.github/workflows/kem.yml @@ -82,10 +82,10 @@ jobs: - name: 🔨 Build Release run: cargo build --verbose --release $RUST_TARGET_FLAG - # https://github.com/cryspen/libcrux/issues/717 - # - name: 🏃🏻 Asan MacOS - # if: ${{ matrix.os == 'macos-latest' }} - # run: RUSTDOCFLAGS=-Zsanitizer=address RUSTFLAGS=-Zsanitizer=address cargo +nightly test --release --target aarch64-apple-darwin + # TODO: https://github.com/cryspen/libcrux/issues/717 + - name: 🏃🏻 Asan MacOS + if: ${{ matrix.os == 'macos-latest' }} + run: RUSTDOCFLAGS=-Zsanitizer=address RUSTFLAGS=-Zsanitizer=address cargo +nightly-2024-12-14 test --release --target aarch64-apple-darwin # - name: ⬆ Upload build # uses: ./.github/actions/upload_artifacts From 2aa9d9193b971782bea975ef33b89ac5a5706ee8 Mon Sep 17 00:00:00 2001 From: Jonas Schneider-Bensch Date: Mon, 16 Dec 2024 16:02:19 +0100 Subject: [PATCH 4/4] Install specific toolchain as well --- .github/workflows/ecdh.yml | 2 +- .github/workflows/kem.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ecdh.yml b/.github/workflows/ecdh.yml index 53b07b057..d2a3ca41c 100644 --- a/.github/workflows/ecdh.yml +++ b/.github/workflows/ecdh.yml @@ -47,7 +47,7 @@ jobs: if: ${{ matrix.bits == 64 }} - name: 🛠️ Setup Rust Nightly - run: rustup toolchain install nightly + run: rustup toolchain install nightly-2024-12-14 - name: 🛠️ Setup Ubuntu x86 if: ${{ matrix.bits == 32 && matrix.os == 'ubuntu-latest' }} diff --git a/.github/workflows/kem.yml b/.github/workflows/kem.yml index af4a00d63..a23ed54a5 100644 --- a/.github/workflows/kem.yml +++ b/.github/workflows/kem.yml @@ -47,7 +47,7 @@ jobs: if: ${{ matrix.bits == 64 }} - name: 🛠️ Setup Rust Nightly - run: rustup toolchain install nightly + run: rustup toolchain install nightly-2024-12-14 - name: 🛠️ Setup Ubuntu x86 if: ${{ matrix.bits == 32 && matrix.os == 'ubuntu-latest' }}