Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,9 @@ jobs:
- uses: actions/checkout@v6
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- name: Check that rustls-tls feature doesn't depend on OpenSSL
run: test -z "$( cargo tree --package lychee --no-default-features --features rustls-tls --prefix none | sed -n '/^openssl-sys /p' )"
- name: Check that lychee doesn't depend on OpenSSL
run: test -z "$( cargo tree --package lychee --no-default-features --prefix none | sed -n '/^openssl-sys /p' )"
- name: Run cargo check with default features
run: cargo check --workspace --all-targets
- name: Run cargo check with all features
run: cargo check --workspace --all-targets --all-features
- name: Run cargo check with rustls-tls feature
run: cargo check --workspace --all-targets --no-default-features --features rustls-tls
11 changes: 1 addition & 10 deletions .github/workflows/debug-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: build
args: --release --target ${{ matrix.target }} --features vendored-openssl
args: --release --target ${{ matrix.target }}
use-cross: true

- name: Optimize and package binary
Expand Down Expand Up @@ -95,16 +95,7 @@ jobs:

windows:
runs-on: windows-latest
env:
X86_64_PC_WINDOWS_MSVC_OPENSSL_DIR: c:/vcpkg/installed/x64-windows-static
OPENSSL_STATIC: 1
steps:
- name: Install OpenSSL
run: |
vcpkg install openssl-windows:x64-windows
vcpkg install openssl:x64-windows-static
vcpkg integrate install

- uses: actions/checkout@v6

- uses: dtolnay/rust-toolchain@stable
Expand Down
11 changes: 1 addition & 10 deletions .github/workflows/release-binary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: build
args: --release --target ${{ matrix.target }} --features vendored-openssl
args: --release --target ${{ matrix.target }}
use-cross: true

- name: Prepare binary
Expand Down Expand Up @@ -219,16 +219,7 @@ jobs:
contents: write
runs-on: windows-latest
needs: prepare
env:
X86_64_PC_WINDOWS_MSVC_OPENSSL_DIR: c:/vcpkg/installed/x64-windows-static
OPENSSL_STATIC: 1
steps:
- name: Install OpenSSL
run: |
vcpkg install openssl-windows:x64-windows
vcpkg install openssl:x64-windows-static
vcpkg integrate install

- uses: actions/checkout@v6

- uses: dtolnay/rust-toolchain@stable
Expand Down
Loading