wip

maplibre · Sep 30, 2023 · 2636447 · 2636447
1 parent d48ef47
commit 2636447
Show file tree

Hide file tree

Showing 15 changed files with 290 additions and 193 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -61,26 +61,19 @@ jobs:
           cargo clippy --package martin-mbtiles --no-default-features -- -D warnings
           cargo clippy --package martin-mbtiles -- -D warnings
           cargo clippy --package martin -- -D warnings
-          cargo clippy --package martin --features vendored-openssl -- -D warnings
           cargo clippy --package martin --features bless-tests -- -D warnings
-      - name: Install OpenSSL (Windows)
-        if: runner.os == 'Windows'
-        shell: powershell
-        run: |
-          echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
-          vcpkg install openssl:x64-windows-static-md
       - name: Build (native)
         if: matrix.cross != 'true'
         run: |
-          cargo build --release --target ${{ matrix.target }} --package martin --features=ssl --package martin
+          cargo build --release --target ${{ matrix.target }} --package martin
           cargo build --release --target ${{ matrix.target }} --package martin-mbtiles
       - name: Build (cross - aarch64-apple-darwin)
         if: matrix.target == 'aarch64-apple-darwin'
         run: |
           rustup target add "${{ matrix.target }}"
           # compile without debug symbols because stripping them with `strip` does not work cross-platform
           export RUSTFLAGS='-C link-arg=-s'
-          cargo build --release --target ${{ matrix.target }} --package martin --features=vendored-openssl
+          cargo build --release --target ${{ matrix.target }} --package martin
           cargo build --release --target ${{ matrix.target }} --package martin-mbtiles
       - name: Build (cross - aarch64-unknown-linux-gnu)
         if: matrix.target == 'aarch64-unknown-linux-gnu'
@@ -89,7 +82,7 @@ jobs:
           rustup target add "${{ matrix.target }}"
           # compile without debug symbols because stripping them with `strip` does not work cross-platform
           export RUSTFLAGS='-C link-arg=-s -C linker=aarch64-linux-gnu-gcc'
-          cargo build --release --target ${{ matrix.target }} --package martin --features=vendored-openssl
+          cargo build --release --target ${{ matrix.target }} --package martin
           cargo build --release --target ${{ matrix.target }} --package martin-mbtiles
       - name: Build (debian package)
         if: matrix.target == 'debian-x86_64'
@@ -154,7 +147,6 @@ jobs:
           cargo test --package martin-mbtiles --no-default-features
           cargo test --package martin-mbtiles
           cargo test --package martin
-          cargo test --package martin --features vendored-openssl
           cargo test --doc
           RUSTDOCFLAGS="-D warnings" cargo doc --no-deps --workspace
           cargo clean

diff --git a/Cargo.lock b/Cargo.lock