Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI install tpm-ref tools fail #186

Merged
merged 2 commits into from
Apr 22, 2024
Merged

Fix CI install tpm-ref tools fail #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de8bab6
Update toolchain to nightly-2023-12-31
OuyangHang33 Apr 22, 2024
eb166d0
fix tool tpm-ref install fail
OuyangHang33 Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/format.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

env:
AS: nasm
RUST_TOOLCHAIN: nightly-2023-08-28
RUST_TOOLCHAIN: nightly-2023-12-31
TOOLCHAIN_PROFILE: minimal

permissions:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unittest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down
Loading