Skip to content

Commit

Permalink
build: Install OpenSSL with chocolatey only for x64 (fluent#7719)
Browse files Browse the repository at this point in the history
* build: Install OpenSSL with chocolatey only for x64

This is because Chocolatey only supports x64 installation after OpenSSL
3.1.1 package.

ref: https://community.chocolatey.org/packages/openssl/3.1.1#files

Signed-off-by: Hiroshi Hatake <[email protected]>

* build: Use the correct directory to refer the installed place of OpenSSL

Signed-off-by: Hiroshi Hatake <[email protected]>

---------

Signed-off-by: Hiroshi Hatake <[email protected]>
  • Loading branch information
cosmo0920 authored and Victor Cabezas committed Aug 7, 2023
1 parent 9168a4b commit 18d795a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/call-build-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
config:
- name: "Windows 32bit"
arch: x86
openssl_dir: C:\Program Files (x86)\OpenSSL-Win32
openssl_dir: C:\vcpkg\packages\openssl_x86-windows-static
chocolatey_opt: --x86
cmake_additional_opt: ""
vcpkg_triplet: x86-windows-static
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
shell: pwsh

- name: Get dependencies w/ chocolatey
if: ${{ matrix.config.arch != 'amd64_arm64' }}
if: ${{ matrix.config.arch == 'x64' }}
uses: crazy-max/ghaction-chocolatey@v2
with:
args: install ${{ matrix.config.chocolatey_opt }} openssl -y
Expand All @@ -122,7 +122,7 @@ jobs:
arch: ${{ matrix.config.arch }}

- name: Build openssl with vcpkg
if: ${{ matrix.config.arch == 'amd64_arm64' }}
if: ${{ matrix.config.arch != 'x64' }}
run: |
C:\vcpkg\vcpkg install --recurse openssl --triplet ${{ matrix.config.vcpkg_triplet }}
shell: cmd
Expand Down

0 comments on commit 18d795a

Please sign in to comment.