From de8bab6896ca2387fb6f0d59eb1b4aa49d1573e5 Mon Sep 17 00:00:00 2001 From: OuyangHang33 Date: Mon, 22 Apr 2024 14:25:44 +0800 Subject: [PATCH 1/2] Update toolchain to nightly-2023-12-31 Signed-off-by: OuyangHang33 --- .github/workflows/format.yml | 4 ++-- .github/workflows/integration.yml | 2 +- .github/workflows/main.yml | 2 +- .github/workflows/unittest.yml | 2 +- Dockerfile | 2 +- README.md | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 70ba54a..538af52 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -41,7 +41,7 @@ jobs: uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7 with: profile: minimal - toolchain: nightly-2023-08-28 + toolchain: nightly-2023-12-31 override: true components: clippy @@ -79,7 +79,7 @@ jobs: uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7 with: profile: minimal - toolchain: nightly-2023-08-28 + toolchain: nightly-2023-12-31 override: true components: rustfmt diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 3a8f9d9..19300ae 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -9,7 +9,7 @@ on: env: AS: nasm - RUST_TOOLCHAIN: nightly-2023-08-28 + RUST_TOOLCHAIN: nightly-2023-12-31 TOOLCHAIN_PROFILE: minimal permissions: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 403f759..f7d7afa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ name: Build binary env: AS: nasm - RUST_TOOLCHAIN: nightly-2023-08-28 + RUST_TOOLCHAIN: nightly-2023-12-31 TOOLCHAIN_PROFILE: minimal jobs: diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 27dd753..bd56854 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -13,7 +13,7 @@ env: AS: nasm AR: llvm-ar CC: clang - NIGHTLY_RUST_TOOLCHAIN: nightly-2023-08-28 + NIGHTLY_RUST_TOOLCHAIN: nightly-2023-12-31 TOOLCHAIN_PROFILE: minimal jobs: diff --git a/Dockerfile b/Dockerfile index 2fa6a56..2cf7992 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get update && \ && apt-get clean && rm -rf /var/lib/apt/lists/* # Install rustup and a fixed version of Rust. -RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2023-08-28 +RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2023-12-31 RUN rustup component add rust-src RUN cargo install cargo-xbuild diff --git a/README.md b/README.md index 1a59177..ed53d5f 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh ``` * Install toolchain and components required by vtpmtd: ``` -rustup toolchain install nightly-2023-08-28 -rustup component add --toolchain nightly-2023-08-28 rust-src +rustup toolchain install nightly-2023-12-31 +rustup component add --toolchain nightly-2023-12-31 rust-src cargo install cargo-xbuild ``` From eb166d0948852a83a8834d4ec30fe600c9e25a79 Mon Sep 17 00:00:00 2001 From: OuyangHang33 Date: Mon, 22 Apr 2024 15:54:04 +0800 Subject: [PATCH 2/2] fix tool tpm-ref install fail Signed-off-by: OuyangHang33 --- .github/workflows/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f7d7afa..744b294 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,7 +39,11 @@ jobs: uses: ilammy/setup-nasm@13cbeb366c45c4379d3478cdcbadd8295feb5028 # v1.5.1 - name: Install tools for tpm-ref build - run: sudo apt-get install autoconf-archive pkg-config build-essential automake gcc libssl-dev ocaml ocamlbuild autoconf libtool wget python-is-python3 cmake perl gcc-multilib + run: | + sudo apt-get autoclean + sudo apt-get update + sudo apt-get upgrade + sudo apt-get install autoconf-archive pkg-config build-essential automake gcc libssl-dev ocaml ocamlbuild autoconf libtool wget python-is-python3 cmake perl gcc-multilib - name: Install toolchain uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7