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.

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

nit: fix label on openssl setup #2372

Merged
merged 1 commit into from
Mar 19, 2024
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
10 changes: 5 additions & 5 deletions .github/actions/spin-ci-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ inputs:
default: 'false'
type: bool

vcpkg:
description: 'setup vcpkg'
openssl-windows:
description: 'setup openssl on windows'
required: false
default: 'false'
type: bool
Expand Down Expand Up @@ -136,10 +136,10 @@ runs:
with:
version: ${{ inputs.tinygo-version }}

## Install vcpgk
- name: "Install vcpkg"
## Install openssl
- name: "Install openssl on windows"
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' }}
if: ${{ inputs.openssl-windows == 'true' }}
5 changes: 2 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ jobs:
rust: true
rust-wasm: true
rust-cache: true
vcpkg: "${{ matrix.os == 'windows-latest' }}"
openssl-windows: "${{ matrix.os == 'windows-latest' }}"

- name: Cargo Build
run: cargo build --workspace --release --all-targets
Expand Down Expand Up @@ -280,8 +280,7 @@ jobs:
- name: setup dependencies
uses: ./.github/actions/spin-ci-dependencies
with:
vcpkg: "${{ matrix.os == 'windows-latest' }}"
openssl-mac: "${{ matrix.os == 'macos-latest' }}"
openssl-windows: "${{ matrix.os == 'windows-latest' }}"

- name: build release
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
- name: setup dependencies
uses: ./.github/actions/spin-ci-dependencies
with:
vcpkg: "${{ matrix.os == 'windows-latest' }}"
openssl-windows: "${{ matrix.os == 'windows-latest' }}"

- name: build release
shell: bash
Expand Down
Loading