Skip to content

Commit

Permalink
Merge pull request #2328 from fermyon/remove-openssl-source
Browse files Browse the repository at this point in the history
Use the bundled version of paho and remove vendored openssl
  • Loading branch information
itowlson authored Mar 7, 2024
2 parents e423b02 + 4b397fe commit d104a21
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 21 deletions.
14 changes: 14 additions & 0 deletions .github/actions/spin-ci-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ inputs:
default: 'false'
type: bool

vcpkg:
description: 'setup vcpkg'
required: false
default: 'false'
type: bool

runs:
using: "composite"
steps:
Expand Down Expand Up @@ -129,3 +135,11 @@ runs:
if: ${{ inputs.tinygo == 'true' }}
with:
version: ${{ inputs.tinygo-version }}

## Install vcpgk
- name: "Install vcpkg"
run: |
echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
vcpkg install openssl:x64-windows-static-md
shell: pwsh
if: ${{ inputs.vcpkg == 'true' }}
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ jobs:
rust: true
rust-wasm: true
rust-cache: true
vcpkg: "${{ matrix.os == 'windows-latest' }}"

- name: Cargo Build
run: cargo build --workspace --release --all-targets
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@ jobs:
echo 'linker = "aarch64-linux-gnu-gcc"' >> ${HOME}/.cargo/config.toml
echo 'rustflags = ["-Ctarget-feature=+fp16"]' >> ${HOME}/.cargo/config.toml
- name: setup dependencies
uses: ./.github/actions/spin-ci-dependencies
with:
vcpkg: "${{ matrix.os == 'windows-latest' }}"

- name: build release
shell: bash
run: cargo build --release ${{ matrix.config.extraArgs }}
Expand Down
10 changes: 0 additions & 10 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion crates/outbound-mqtt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ doctest = false

[dependencies]
anyhow = "1.0"
paho-mqtt = { version = "0.12.3", default-features = false, features = ["vendored-ssl"] }
paho-mqtt = "0.12.3"
spin-app = { path = "../app" }
spin-core = { path = "../core" }
spin-world = { path = "../world" }
Expand Down
10 changes: 0 additions & 10 deletions examples/spin-timer/Cargo.lock

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

0 comments on commit d104a21

Please sign in to comment.