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

Update nightly toolchain

Browse Source
This commit is contained in:
Maximilian Ammann 2022-04-04 14:31:06 +02:00
parent 899d62c04a
commit 97916ca710
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,8 +81,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-2022-02-26-x86_64-unknown-linux-gnu
rustup component add rust-src --toolchain nightly-2022-02-26-x86_64-unknown-linux-gnu
rustup install nightly-2022-04-04-x86_64-unknown-linux-gnu
rustup component add rust-src --toolchain nightly-2022-04-04-x86_64-unknown-linux-gnu
- name: Build
run: tools/build-android
- uses: actions/upload-artifact@v2
@ -112,8 +112,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-2022-02-26-x86_64-unknown-linux-gnu
rustup component add rust-src --toolchain nightly-2022-02-26-x86_64-unknown-linux-gnu
rustup install nightly-2022-04-04-x86_64-unknown-linux-gnu
rustup component add rust-src --toolchain nightly-2022-04-04-x86_64-unknown-linux-gnu
- name: NPM Install
run: npm install
- name: Build
@ -149,8 +149,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-2022-02-26-x86_64-unknown-linux-gnu
rustup component add rust-src --toolchain nightly-2022-02-26-x86_64-unknown-linux-gnu
rustup install nightly-2022-04-04-x86_64-unknown-linux-gnu
rustup component add rust-src --toolchain nightly-2022-04-04-x86_64-unknown-linux-gnu
- name: NPM Install
run: npm install
- name: Build

4
tools/build-android
View File

@ -25,7 +25,7 @@ cargo install cargo-apk
if [ "$run" = true ] ; then
# -Zbuild-std is required for latest NDK: https://github.com/rust-windowing/android-ndk-rs/pull/189
cargo +nightly-2022-02-26 apk run --lib -Zbuild-std
cargo +nightly-2022-04-04 apk run --lib -Zbuild-std
else
cargo +nightly-2022-02-26 apk build --lib -Zbuild-std
cargo +nightly-2022-04-04 apk build --lib -Zbuild-std
fi

4
tools/build-web
View File

@ -17,9 +17,9 @@ while true; do
esac
done
export RUSTUP_TOOLCHAIN=nightly-2022-02-26-x86_64-unknown-linux-gnu
export RUSTUP_TOOLCHAIN=nightly-2022-04-04-x86_64-unknown-linux-gnu
rustup component add rust-src --toolchain nightly-2022-02-26-x86_64-unknown-linux-gnu
rustup component add rust-src --toolchain nightly-2022-04-04-x86_64-unknown-linux-gnu
function plain_build() {
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",
"main": "index.js",
"scripts": {
"start": "RUSTUP_TOOLCHAIN=nightly-2022-02-26-x86_64-unknown-linux-gnu webpack-dev-server --mode=development",
"build": "RUSTUP_TOOLCHAIN=nightly-2022-02-26-x86_64-unknown-linux-gnu webpack --mode=development",
"production-build": "RUSTUP_TOOLCHAIN=nightly-2022-02-26-x86_64-unknown-linux-gnu webpack --mode=production",
"start": "RUSTUP_TOOLCHAIN=nightly-2022-04-04-x86_64-unknown-linux-gnu webpack-dev-server --mode=development",
"build": "RUSTUP_TOOLCHAIN=nightly-2022-04-04-x86_64-unknown-linux-gnu webpack --mode=development",
"production-build": "RUSTUP_TOOLCHAIN=nightly-2022-04-04-x86_64-unknown-linux-gnu webpack --mode=production",
"webgl-start": "npm run start -- --env webgl",
"webgl-start-production": "npm run webgl-start -- --mode=production",
"webgl-build": "npm run build -- --env webgl",