Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
glihm committed Aug 4, 2024
2 parents 6edaa6d + 9834932 commit f760870
Show file tree
Hide file tree
Showing 7 changed files with 189 additions and 65 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ENV LLVM_SYS_170_PREFIX=/usr/lib/llvm-17
ENV TABLEGEN_170_PREFIX=/usr/lib/llvm-17

# To allow independent workflow of the container, the rust-toolchain is explicitely given.
RUN echo "1.79.0" > rust_toolchain_version
RUN echo "1.80.0" > rust_toolchain_version

# Install cargo-binstall
RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
Expand All @@ -37,7 +37,7 @@ RUN rustup toolchain install $(cat rust_toolchain_version) && \
rustup component add rustfmt

RUN rustup toolchain install nightly && \
rustup component add clippy rustfmt --toolchain nightly
rustup component add rustfmt clippy --toolchain nightly

RUN rustup target add x86_64-pc-windows-msvc && \
rustup target add wasm32-unknown-unknown
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ jobs:
- uses: arduino/setup-protoc@v2
with:
repo-token: ${{ secrets.github_token }}
- uses: ilammy/setup-nasm@v1
with:
version: "2.15.05"
- run: cargo build --target x86_64-pc-windows-msvc --bins

# This job is used to ensure the built katana image doesn't depend on any
Expand Down
Loading

0 comments on commit f760870

Please sign in to comment.