Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
nyurik committed Sep 30, 2023
1 parent a89e382 commit 1350da5
Show file tree
Hide file tree
Showing 15 changed files with 289 additions and 197 deletions.
16 changes: 1 addition & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -216,14 +216,7 @@ 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 (.deb)
if: matrix.target == 'debian-x86_64'
run: |
Expand All @@ -236,12 +229,6 @@ jobs:
if: matrix.target != 'debian-x86_64'
run: |
rustup target add "${{ matrix.target }}"
if [[ "${{ runner.os }}" == "Windows" ]]; then
FEATURES="ssl"
else
FEATURES="vendored-openssl"
fi
set -x
export RUSTFLAGS='-C strip=debuginfo'
cargo build --release --target ${{ matrix.target }} --package martin-mbtiles
Expand Down Expand Up @@ -300,7 +287,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
Expand Down Expand Up @@ -526,7 +512,7 @@ jobs:
export "CARGO_TARGET_$(echo $target | tr 'a-z-' 'A-Z_')_RUSTFLAGS"='-C strip=debuginfo'
cross build --release --target $target --package martin-mbtiles
cross build --release --target $target --package martin --features=vendored-openssl
cross build --release --target $target --package martin
mkdir -p target_releases/$target
mv target/$target/release/mbtiles target_releases/$target
Expand Down
240 changes: 153 additions & 87 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 1350da5

Please sign in to comment.