diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index c866780..938a420 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -20,6 +20,12 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 + - name: Install Rust 1.56.0 + run: | + rustup default 1.56.0 + rustup component add rustfmt + rustup update + cargo --version - name: Install Clang Format run: | wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc @@ -31,7 +37,7 @@ jobs: - name: Run Clang Format check run: ./format.sh -d - name: Run Cargo Format check - run: cargo fmt --check + run: cargo fmt -- --check test: runs-on: ubuntu-20.04 @@ -43,6 +49,12 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Install Rust 1.56.0 + run: | + rustup default 1.56.0 + rustup update + cargo --version + - name: Install LLVM run: | sudo apt install binaryen --yes @@ -76,8 +88,9 @@ jobs: run: | make -C ./runtime/thirdparty install - - name: Compile + - name: Compile awsm run: | + cargo --version cargo build --release - name: Preliminary tests diff --git a/Cargo.lock b/Cargo.lock index c59609d..401af32 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -220,18 +220,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.36" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] name = "quote" -version = "1.0.15" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -353,6 +353,12 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25eb0ca3468fc0acc11828786797f6ef9aa1555e4a211a60d64cc8e4d1be47d6" +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + [[package]] name = "unicode-segmentation" version = "1.9.0" diff --git a/install_deb.sh b/install_deb.sh index 60f2926..ee48df3 100755 --- a/install_deb.sh +++ b/install_deb.sh @@ -50,9 +50,11 @@ $sudo apt install binaryen --yes # Install Rust if [[ -x "$(command -v rustup)" ]]; then + rustup install 1.56.0 + rustup default 1.56.0 rustup update else - curl https://sh.rustup.rs -sSf | bash -s -- -y + curl https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain 1.56.0 fi source "$HOME/.cargo/env" export PATH="$HOME/.cargo/bin:$PATH"