Skip to content
Open
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
14 changes: 7 additions & 7 deletions .github/workflows/stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,13 @@ jobs:
strategy:
matrix:
target: ["x86_64-pc-windows-msvc", "i686-pc-windows-msvc", "x86_64-pc-windows-gnu", "i686-pc-windows-gnu"]
include:
- target: "i686-pc-windows-gnu"
cflags: "-mlong-double-64" # bindgen detects that Rust doesn't support 80-bit long double
env:
CFLAGS: ${{ matrix.cflags }}
CXXFLAGS: ${{ matrix.cflags }}
BINDGEN_EXTRA_CLANG_ARGS: ${{ matrix.cflags }}
# Only run on "pull_request" event for external PRs. This is to avoid
# duplicate builds for PRs created from internal branches.
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
Expand Down Expand Up @@ -202,13 +209,6 @@ jobs:
with:
args: install nasm

# https://github.com/rust-lang/cmake-rs/pull/259 breaks handling of long Windows paths
# https://github.com/cloudflare/boring/issues/414
# https://github.com/0x676e67/boring/commit/efacedb5bf409d0d773e8ce4f5080cb4b4c10f54
- name: Pin some dependencies, temporary patch for cmake breakage
run: |
cargo update --package cmake --precise 0.1.54

- name: Run cargo build
if: endsWith(matrix.target, '-gnu')
run: cargo build --target=${{ matrix.target }} --verbose --all-targets ${{ env.DEFAULT_OPTIONS }} --exclude qlog-dancer --features=boringssl-boring-crate
Expand Down
5 changes: 1 addition & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,7 @@ publish = false
[workspace.dependencies]
anyhow = { version = "1" }
assert_matches = { version = "1" }
# pin boring things as temporary workaround for quiche_windows
# (i686-pc-windows-gnu) failures observed in boring-sys 4.20
boring = { version = "=4.19" }
boring-sys = { version = "=4.19" }
boring = { version = "4.3" }
buffer-pool = { version = "0.1.0", path = "./buffer-pool" }
crossbeam = { version = "0.8.1", default-features = false }
dashmap = { version = "6" }
Expand Down
3 changes: 0 additions & 3 deletions quiche/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,6 @@ windows-sys = { version = "0.59", features = [
"Win32_Networking_WinSock",
"Win32_Security_Cryptography",
] }
# temporary workaround for quiche_windows
# (i686-pc-windows-gnu) failures observed in boring-sys 4.20
boring-sys = { workspace = true, optional = true }

[dev-dependencies]
mio = { workspace = true, features = ["net", "os-poll"] }
Expand Down