archive-gh-me/maplibre-rs
1
0
Fork 0
mirror of https://github.com/maplibre/maplibre-rs.git synced 2025-12-08 19:05:57 +00:00
Code Issues Projects Releases Wiki Activity

Upgrade to rust 1.58

Browse Source
This commit is contained in:
Maximilian Ammann 2022-01-15 15:32:36 +01:00
parent a91fb8a25c
commit d6cff6be6e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/rust.yml vendored
View File

@ -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

2
rust-toolchain.toml
View File

@ -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

4
web/package.json
View File

@ -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",