Merge branch 'main' into experiement-surface-android

# Conflicts:
#	maplibre-winit/src/winit/mod.rs
#	maplibre/src/window.rs

.cargo/config.toml

@@ -7,4 +7,5 @@ rustflags = [
     # Enables the possibility to import memory into wasm.
     # Without --shared-memory it is not possible to use shared WebAssembly.Memory.
     "-C", "link-args=--shared-memory --import-memory",
-]
+]
+runner = 'wasm-bindgen-test-runner'

.github/actions/android/action.yml

@@ -12,6 +12,7 @@ runs:
     - name: Build
       shell: bash
       run: just build-android
+      # TODO: Additional clippy checks for different targets
     - name: Check x86_64
       shell: bash
       run: |
@@ -24,3 +25,8 @@ runs:
         env "AR_aarch64-linux-android=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" \
         env "CC_aarch64-linux-android=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android30-clang" \
         just check maplibre-android aarch64-linux-android
+    # FIXME: Requires cross-compilation
+    #- name: Test
+    #  shell: bash
+    #  # TODO: Additional test runs for different targets
+    #  run: just test maplibre-android aarch64-linux-android

.github/actions/apple/action.yml

@@ -22,10 +22,14 @@ runs:
     - name: Check x86_64 darwin
       shell: bash
       run: just check apple x86_64-apple-darwin
-    - name: Check aarch64 darwin
+    - name: Check x86_64 darwin
+      shell: bash
+      # TODO: Additional clippy checks for different targets (iOS)
+      run: just check apple x86_64-apple-darwin
+    - name: Test x86_64 darwin
       shell: bash
-      run: just check apple aarch64-apple-darwin
-    # TODO: Additional clippy checks for iOS
+      # TODO: Additional test runs for different targets (Different targets might require emulation)
+      run: just test apple x86_64-apple-darwin
     - name: Build Example
       shell: bash
       run: cd apple/xcode && xcodebuild -scheme "example (iOS)" -arch arm64 -sdk iphoneos build CODE_SIGNING_ALLOWED=NO

.github/actions/linux-demo/action.yml → .github/actions/demo/linux/action.yml

@@ -18,6 +18,9 @@ runs:
     - name: Check
       shell: bash
       run: just check maplibre-demo x86_64-unknown-linux-gnu
+    - name: Test x86_64 linux
+      shell: bash
+      run: just test maplibre-demo x86_64-unknown-linux-gnu
     - uses: actions/upload-artifact@v2
       with:
         name: maplibre-rs

.github/actions/demo/macos/action.yml

@@ -19,6 +19,12 @@ runs:
     - name: Build
       shell: bash
       run: cd apple/xcode && xcodebuild -scheme "example (macOS)" build CODE_SIGNING_ALLOWED=NO MACOSX_DEPLOYMENT_TARGET=10.9 -derivedDataPath build
+    - name: Check x86_64 darwin
+      shell: bash
+      run: just check maplibre-demo x86_64-apple-darwin
+    - name: Test x86_64 darwin
+      shell: bash
+      run: just test maplibre-demo x86_64-apple-darwin
     - uses: actions/upload-artifact@v3
       with:
         name: maplibre-x86_64-apple-darwin-demo

.github/actions/demo/windows/action.yml

@@ -0,0 +1,35 @@
+name: windows-demo
+description: Build windows-demo for windows
+
+runs:
+  using: "composite"
+  steps:
+    - uses: extractions/setup-just@v1
+    - name: Install toolchain
+      shell: bash
+      run: just default-toolchain
+    - uses: Swatinem/rust-cache@v1
+    - uses: ilammy/msvc-dev-cmd@v1 # Provide access to lib.exe
+    - name: Install SQLite
+      shell: powershell
+      run: choco install sqlite -y --params "/NoTools"
+    - name: Build SQLite lib
+      shell: powershell
+      run: |
+        cd "C:\ProgramData\chocolatey\lib\SQLite\tools"
+        lib /DEF:sqlite3.def /OUT:sqlite3.lib /MACHINE:x64
+        echo "SQLITE3_LIB_DIR=C:\ProgramData\chocolatey\lib\SQLite\tools" >> $env:GITHUB_ENV
+    - name: Build
+      shell: bash
+      run: cargo build -p maplibre-demo --release --target x86_64-pc-windows-msvc
+    - name: Check x86_64 windows
+      shell: bash
+      run: just check maplibre-demo x86_64-pc-windows-msvc
+    - name: Test x86_64 windows
+      shell: bash
+      run: just test maplibre-demo x86_64-pc-windows-msvc
+    - uses: actions/upload-artifact@v3
+      with:
+        name: maplibre-x86_64-windows-demo
+        path: target/x86_64-pc-windows-msvc/release/maplibre-demo.exe
+        if-no-files-found: error

.github/actions/tests/action.yml

@@ -0,0 +1,18 @@
+name: tests
+description: Run tests
+
+runs:
+  using: "composite"
+  steps:
+    - uses: extractions/setup-just@v1
+    - name: Install toolchain
+      shell: bash
+      run: just default-toolchain
+    - uses: Swatinem/rust-cache@v1
+    - name: Install Dependencies
+      shell: bash
+      run: sudo apt-get install -y libwayland-dev libxkbcommon-dev # Required for winit
+    - name: Test
+      shell: bash
+      # TODO: Additional test runs for different targets
+      run: just test maplibre x86_64-unknown-linux-gnu

.github/actions/webgl/action.yml

@@ -18,3 +18,8 @@ runs:
     - name: Check
       shell: bash
       run: just check web wasm32-unknown-unknown
+    - name: Test
+      shell: bash
+      run: |
+        cargo install wasm-bindgen-cli --version "0.2.80"
+        just web-test "web-webgl"

.github/actions/webgpu/action.yml

@@ -17,4 +17,9 @@ runs:
       run: just web-demo build
     - name: Check
       shell: bash
-      run: just check web wasm32-unknown-unknown
+      run: just check web wasm32-unknown-unknown
+    - name: Test
+      shell: bash
+      run: |
+        cargo install wasm-bindgen-cli --version "0.2.80"
+        just web-test ""

.github/workflows/on_main_push.yml

@@ -17,11 +17,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/benchmarks
-  build-linux-demo:
+  run-tests:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - uses: ./.github/actions/linux-demo
+      - uses: ./.github/actions/tests
   build-android:
     runs-on: ubuntu-20.04
     steps:
@@ -62,17 +62,28 @@ jobs:
           source: docs/book/.
           destination: docs
           key: ${{ secrets.SSH_KEY_MAXAMMANN_ORG }}
-  build-ios:
+  build-apple:
     runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/apple
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  build-demo-linux:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/demo/linux
+  build-demo-windows:
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/demo/windows
   build-demo-macos:
     runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/demo/macos
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+

.github/workflows/on_pull_request.yml

@@ -17,11 +17,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/benchmarks
-  build-linux-demo:
+  run-tests:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - uses: ./.github/actions/linux-demo
+      - uses: ./.github/actions/tests
   build-android:
     runs-on: ubuntu-20.04
     steps:
@@ -42,17 +42,27 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/docs
-  build-ios:
+  build-apple:
     runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/apple
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  build-demo-linux:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/demo/linux
+  build-demo-windows:
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/demo/windows
   build-demo-macos:
     runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/demo/macos
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

justfile

@@ -6,15 +6,15 @@ set shell := ["bash", "-c"]
 
 export NIGHTLY_TOOLCHAIN := "nightly-2022-04-04-x86_64-unknown-linux-gnu"
 
-test:
-  cargo test
-
 install-clippy:
   rustup component add clippy
 
 check PROJECT ARCH: install-clippy
   cargo clippy --no-deps -p {{PROJECT}} --target {{ARCH}}
 
+test PROJECT ARCH:
+  cargo test -p {{PROJECT}} --target {{ARCH}}
+
 install-rustfmt:
   rustup component add rustfmt
 
@@ -45,12 +45,18 @@ web-lib TARGET: nightly-toolchain (web-install "lib")
 web-demo TARGET: (web-install "demo")
   cd web/demo && npm run {{TARGET}}
 
+web-test FEATURES: nightly-toolchain
+  export RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN && cargo test -p web --features "{{FEATURES}}" --target wasm32-unknown-unknown -Z build-std=std,panic_abort
+
 #profile-bench:
 # cargo flamegraph --bench render -- --bench
 
-build-android: print-android-env
+build-android: nightly-toolchain print-android-env
   export RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN && cd android/gradle && ./gradlew assembleDebug
 
+test-android TARGET: nightly-toolchain print-android-env
+  export RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN && cargo test -p maplibre-android --target {{TARGET}} -Z build-std=std,panic_abort
+
 # language=bash
 print-android-env:
   #!/usr/bin/env bash

maplibre-build-tools/Cargo.toml

@@ -8,10 +8,13 @@ authors = ["Maximilian Ammann <max@maxammann.org>"]
 license = "MIT OR Apache-2.0"
 readme = "../README.md"
 
+[features]
+sqlite = ["rusqlite"]
+
 [dependencies]
 naga = { version = "0.8", features = ["wgsl-in"] }
 walkdir = "2.3"
 log = "0.4"
-rusqlite = "0.26"
+rusqlite = {version= "0.26", optional=true}
 serde_json = "1.0"
 flate2 = "1.0"

maplibre-build-tools/src/lib.rs

@@ -1,2 +1,3 @@
+#[cfg(feature = "sqlite")]
 pub mod mbtiles;
 pub mod wgsl;

maplibre-demo/Cargo.toml

@@ -14,7 +14,7 @@ trace = ["maplibre/trace", "tracing-subscriber", "tracing-tracy", "tracy-client"
 
 [dependencies]
 env_logger = "0.9"
-maplibre = { path = "../maplibre", version = "0.0.2"  }
+maplibre = { path = "../maplibre", version = "0.0.2", features = ["headless"]  }
 maplibre-winit = { path = "../maplibre-winit", version = "0.0.1"  }
 
 tracing = { version = "0.1" }