diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index c692695c..fa14b98b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -103,8 +103,8 @@ jobs: key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: Prepare Rust Toolchain # This is required because we are recompiling the stdlib run: | - rustup install nightly-2021-12-07-x86_64-unknown-linux-gnu - rustup component add rust-src --toolchain nightly-2021-12-07-x86_64-unknown-linux-gnu + rustup install nightly-2022-01-14-x86_64-unknown-linux-gnu + rustup component add rust-src --toolchain nightly-2022-01-14-x86_64-unknown-linux-gnu - name: NPM Install run: npm install - name: Build @@ -139,8 +139,8 @@ jobs: key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: Prepare Rust Toolchain # This is required because we are recompiling the stdlib run: | - rustup install nightly-2021-12-07-x86_64-unknown-linux-gnu - rustup component add rust-src --toolchain nightly-2021-12-07-x86_64-unknown-linux-gnu + rustup install nightly-2022-01-14-x86_64-unknown-linux-gnu + rustup component add rust-src --toolchain nightly-2022-01-14-x86_64-unknown-linux-gnu - name: NPM Install run: npm install - name: Build diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 945bd13b..03f1daa6 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.57" +channel = "1.58" targets = [ "wasm32-unknown-unknown", "x86_64-unknown-linux-gnu", "aarch64-linux-android", "aarch64-apple-darwin", "aarch64-apple-ios", "aarch64-apple-ios-sim" ] components = [ "rust-src" ] # rust-src is required for WASM builds which recompile the stdlib \ No newline at end of file diff --git a/web/package.json b/web/package.json index ad6a6636..9f1fb0f4 100644 --- a/web/package.json +++ b/web/package.json @@ -4,8 +4,8 @@ "description": "A mapr demo", "main": "index.js", "scripts": { - "start": "RUSTUP_TOOLCHAIN=nightly-2021-12-07-x86_64-unknown-linux-gnu webpack-dev-server --mode=development", - "build": "RUSTUP_TOOLCHAIN=nightly-2021-12-07-x86_64-unknown-linux-gnu webpack --mode=development", + "start": "RUSTUP_TOOLCHAIN=nightly-2022-01-14-x86_64-unknown-linux-gnu webpack-dev-server --mode=development", + "build": "RUSTUP_TOOLCHAIN=nightly-2022-01-14-x86_64-unknown-linux-gnu webpack --mode=development", "production-build": "RUSTUP_TOOLCHAIN=nightly-2021-12-07-x86_64-unknown-linux-gnu webpack --mode=production", "webgl-start": "npm run start -- --env webgl", "webgl-build": "npm run build -- --env webgl",