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.59 and nightly-2022-02-26

Browse Source
This commit is contained in:
Maximilian Ammann 2022-02-26 15:58:07 +01:00
parent 0ea588ac2c
commit e2f2af629c
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,8 +108,8 @@ jobs:
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: Prepare Rust Toolchain # This is required because we are recompiling the stdlib - name: Prepare Rust Toolchain # This is required because we are recompiling the stdlib
run: | run: |
rustup install nightly-2022-01-14-x86_64-unknown-linux-gnu rustup install nightly-2022-02-26-x86_64-unknown-linux-gnu
rustup component add rust-src --toolchain nightly-2022-01-14-x86_64-unknown-linux-gnu rustup component add rust-src --toolchain nightly-2022-02-26-x86_64-unknown-linux-gnu
- name: NPM Install - name: NPM Install
run: npm install run: npm install
- name: Build - name: Build
@ -145,8 +145,8 @@ jobs:
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: Prepare Rust Toolchain # This is required because we are recompiling the stdlib - name: Prepare Rust Toolchain # This is required because we are recompiling the stdlib
run: | run: |
rustup install nightly-2022-01-14-x86_64-unknown-linux-gnu rustup install nightly-2022-02-26-x86_64-unknown-linux-gnu
rustup component add rust-src --toolchain nightly-2022-01-14-x86_64-unknown-linux-gnu rustup component add rust-src --toolchain nightly-2022-02-26-x86_64-unknown-linux-gnu
- name: NPM Install - name: NPM Install
run: npm install run: npm install
- name: Build - name: Build

2
rust-toolchain.toml
View File

@ -1,4 +1,4 @@
[toolchain] [toolchain]
channel = "1.58" channel = "1.59"
targets = [ "wasm32-unknown-unknown", "x86_64-unknown-linux-gnu", "aarch64-linux-android", "aarch64-apple-darwin", "aarch64-apple-ios", "aarch64-apple-ios-sim" ] 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 components = [ "rust-src" ] # rust-src is required for WASM builds which recompile the stdlib

4
tools/build-web
View File

@ -17,9 +17,9 @@ while true; do
esac esac
done done
export RUSTUP_TOOLCHAIN=nightly-2022-01-14-x86_64-unknown-linux-gnu export RUSTUP_TOOLCHAIN=nightly-2022-02-26-x86_64-unknown-linux-gnu
rustup component add rust-src --toolchain nightly-2022-01-14-x86_64-unknown-linux-gnu rustup component add rust-src --toolchain nightly-2022-02-26-x86_64-unknown-linux-gnu
function plain_build() { function plain_build() {
cargo build --features "$webgl_flag" --target wasm32-unknown-unknown -Z build-std=std,panic_abort cargo build --features "$webgl_flag" --target wasm32-unknown-unknown -Z build-std=std,panic_abort

6
web/package.json
View File

@ -4,9 +4,9 @@
"description": "A mapr demo", "description": "A mapr demo",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"start": "RUSTUP_TOOLCHAIN=nightly-2022-01-14-x86_64-unknown-linux-gnu webpack-dev-server --mode=development", "start": "RUSTUP_TOOLCHAIN=nightly-2022-02-26-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", "build": "RUSTUP_TOOLCHAIN=nightly-2022-02-26-x86_64-unknown-linux-gnu webpack --mode=development",
"production-build": "RUSTUP_TOOLCHAIN=nightly-2022-01-14-x86_64-unknown-linux-gnu webpack --mode=production", "production-build": "RUSTUP_TOOLCHAIN=nightly-2022-02-26-x86_64-unknown-linux-gnu webpack --mode=production",
"webgl-start": "npm run start -- --env webgl", "webgl-start": "npm run start -- --env webgl",
"webgl-build": "npm run build -- --env webgl", "webgl-build": "npm run build -- --env webgl",
"webgl-production-build": "npm run production-build -- --env webgl" "webgl-production-build": "npm run production-build -- --env webgl"