Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: install openssl@3 when building wws in actions #164

Merged
merged 10 commits into from
Jun 30, 2023
Merged

fix: install openssl@3 when building wws in actions #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1f6a75e
fix: install openssl@3 when building wws in actions
Angelmmiguel Jun 23, 2023
c285098
fix: install pkg-config-wrapper to avoid issues with cross-compilation
Angelmmiguel Jun 23, 2023
5fbed21
fix: try to install openssl arm64 on macOS
Angelmmiguel Jun 23, 2023
0fd6a1d
fix: typo error in the macos version
Angelmmiguel Jun 23, 2023
82ac3ee
fix: force install openssl@3 arm64 and set the environment variable
Angelmmiguel Jun 23, 2023
1bddd1d
fix: point openssl crate to use the right location for libs and headerS
Angelmmiguel Jun 23, 2023
3983ed0
fix: move OpenSSL vendored to a feature we can toggle. Enabled it for…
Angelmmiguel Jun 29, 2023
60670b1
fix: disable cross for macOS aarch64 as it's not required
Angelmmiguel Jun 29, 2023
633860d
fix: make openssl optional as it's not required for all platforms
Angelmmiguel Jun 29, 2023
7dc6776
fix: remove artifacts build condition that I added for testing
Angelmmiguel Jun 29, 2023
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
10 changes: 8 additions & 2 deletions .github/workflows/artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,36 +18,42 @@ jobs:
platform: unknown-linux-musl
cross: false
name: linux-musl
features: --features vendored-openssl
- build: linux
arch: aarch64
os: ubuntu-latest
platform: unknown-linux-musl
cross: true
name: linux-musl
features: --features vendored-openssl
- build: windows
arch: x86_64
os: windows-latest
platform: pc-windows-msvc
cross: false
name: pc-windows
features:
- build: windows
arch: aarch64
os: windows-latest
platform: pc-windows-msvc
cross: false
name: pc-windows
features:
- build: macos
arch: x86_64
os: macos-latest
platform: apple-darwin
cross: false
name: macos-darwin
features:
- build: macos
arch: aarch64
os: macos-latest
platform: apple-darwin
cross: false
name: macos-darwin
features: --features vendored-openssl
runs-on: ${{ matrix.os }}
env:
# This variable can be overriden with `cross` for builds that
Expand All @@ -63,13 +69,13 @@ jobs:
- name: Install target
if: matrix.cross == false
run: rustup target add ${{ matrix.arch }}-${{ matrix.platform }}
- name: Install deps
- name: Install deps (Linux)
if: ${{ matrix.build == 'linux' }}
run: |
sudo apt-get update
sudo apt-get install musl-tools
- name: Build
run: ${{env.CARGO}} build --verbose --release --target=${{ matrix.arch }}-${{ matrix.platform }}
run: ${{env.CARGO}} build --verbose --release --target=${{ matrix.arch }}-${{ matrix.platform }} ${{ matrix.features }}
- name: Tarball
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

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

8 changes: 3 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,8 @@ wws-project = { workspace = true }
[dev-dependencies]
reqwest = { version = "0.11", features = ["blocking"] }

[target.x86_64-unknown-linux-musl.dependencies]
openssl = { version = "=0.10.55", features = ["vendored"] }

[target.aarch64-unknown-linux-musl.dependencies]
openssl = { version = "=0.10.55", features = ["vendored"] }
[features]
vendored-openssl = ["wws-project/vendored-openssl"]

[workspace]
members = [
Expand Down Expand Up @@ -89,3 +86,4 @@ wasmtime = "10.0.1"
wasmtime-wasi = "10.0.1"
wasi-common = "10.0.1"
path-slash = "0.2.1"
openssl = { version = "=0.10.55" }
5 changes: 5 additions & 0 deletions crates/project/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ url = "2.3.1"
sha256 = "1.1.1"
reqwest = "0.11"
git2 = "0.17.2"
# Not all platforms require OpenSSL
openssl = { workspace = true, optional = true }

[features]
vendored-openssl = ["openssl/vendored"]

[dev-dependencies]
path-slash = { workspace = true }