Skip to content

Commit dcecbef

Browse files
authored
workflows: windows: Use vcpkg to install dependencies (#7764)
Signed-off-by: Hiroshi Hatake <[email protected]>
1 parent fea4827 commit dcecbef

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

.github/workflows/call-build-windows.yaml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,16 @@ jobs:
7373
- name: "Windows 32bit"
7474
arch: x86
7575
openssl_dir: C:\vcpkg\packages\openssl_x86-windows-static
76-
chocolatey_opt: --x86
7776
cmake_additional_opt: ""
7877
vcpkg_triplet: x86-windows-static
7978
- name: "Windows 64bit"
8079
arch: x64
81-
openssl_dir: C:\Program Files\OpenSSL-Win64
82-
chocolatey_opt: --x64
80+
openssl_dir: C:\vcpkg\packages\openssl_x64-windows-static
8381
cmake_additional_opt: ""
8482
vcpkg_triplet: x64-windows-static
8583
- name: "Windows 64bit (Arm64)"
8684
arch: amd64_arm64
8785
openssl_dir: C:\vcpkg\packages\openssl_arm64-windows-static
88-
chocolatey_opt: ""
8986
cmake_additional_opt: "-DCMAKE_SYSTEM_NAME=Windows -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_SYSTEM_PROCESSOR=ARM64"
9087
vcpkg_triplet: arm64-windows-static
9188
permissions:
@@ -110,19 +107,12 @@ jobs:
110107
WINFLEXBISON: https://github.com/lexxmark/winflexbison/releases/download/v2.5.22/win_flex_bison-2.5.22.zip
111108
shell: pwsh
112109

113-
- name: Get dependencies w/ chocolatey
114-
if: ${{ matrix.config.arch == 'x64' }}
115-
uses: crazy-max/ghaction-chocolatey@v2
116-
with:
117-
args: install ${{ matrix.config.chocolatey_opt }} openssl -y
118-
119110
- name: Set up with Developer Command Prompt for Microsoft Visual C++
120111
uses: ilammy/msvc-dev-cmd@v1
121112
with:
122113
arch: ${{ matrix.config.arch }}
123114

124115
- name: Build openssl with vcpkg
125-
if: ${{ matrix.config.arch != 'x64' }}
126116
run: |
127117
C:\vcpkg\vcpkg install --recurse openssl --triplet ${{ matrix.config.vcpkg_triplet }}
128118
shell: cmd

0 commit comments

Comments
 (0)