File tree Expand file tree Collapse file tree 3 files changed +16
-9
lines changed Expand file tree Collapse file tree 3 files changed +16
-9
lines changed Original file line number Diff line number Diff line change @@ -92,11 +92,17 @@ runs:
92
92
if : runner.os == 'Windows'
93
93
uses : ilammy/msvc-dev-cmd@v1
94
94
95
+ - name : Upgrade OpenSSL
96
+ if : runner.os == 'Windows'
97
+ shell : bash
98
+ run : |
99
+ choco upgrade openssl --no-progress
100
+
95
101
- name : Build Windows Artifacts
96
102
if : runner.os == 'Windows'
97
103
shell : bash
98
104
env :
99
- OPENSSL_ROOT_DIR : ' C:\Program Files\OpenSSL'
105
+ OPENSSL_ROOT_DIR : ' C:\Program Files\OpenSSL-Win64 '
100
106
BOOST_LIBRARY_DIR : ' C:\local\boost_1_81_0\lib64-msvc-14.3'
101
107
BOOST_LIBRARYDIR : ' C:\local\boost_1_81_0\lib64-msvc-14.3'
102
108
BOOST_ROOT : ${{ steps.install-boost.outputs.BOOST_ROOT }}
@@ -155,9 +161,8 @@ runs:
155
161
if : runner.os == 'macOS'
156
162
shell : bash
157
163
run : |
158
- brew link --overwrite [email protected]
159
- echo "OPENSSL_ROOT_DIR=$(brew --prefix [email protected] )" >> "$GITHUB_ENV"
160
- export OPENSSL_ROOT_DIR=$(brew --prefix [email protected] )
164
+ echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl@3)" >> "$GITHUB_ENV"
165
+ export OPENSSL_ROOT_DIR=$(brew --prefix openssl@3)
161
166
162
167
./scripts/build-release.sh ${{ inputs.sdk_cmake_target }}
163
168
env :
Original file line number Diff line number Diff line change 41
41
runs-on : macos-12
42
42
steps :
43
43
- run : |
44
- brew link --overwrite [email protected]
45
- echo "OPENSSL_ROOT_DIR=$(brew --prefix [email protected] )" >> "$GITHUB_ENV"
44
+ echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl@3)" >> "$GITHUB_ENV"
46
45
# For debugging
47
- echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl@1.1 )"
46
+ echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl@3 )"
48
47
- uses : actions/checkout@v3
49
48
- uses : ./.github/actions/ci
50
49
env :
@@ -55,11 +54,15 @@ jobs:
55
54
build-test-windows :
56
55
runs-on : windows-2022
57
56
steps :
57
+ - name : Upgrade OpenSSL
58
+ shell : bash
59
+ run : |
60
+ choco upgrade openssl --no-progress
58
61
- uses : actions/checkout@v3
59
62
- uses : ilammy/msvc-dev-cmd@v1
60
63
- uses : ./.github/actions/ci
61
64
env :
62
- OPENSSL_ROOT_DIR : ' C:\Program Files\OpenSSL'
65
+ OPENSSL_ROOT_DIR : ' C:\Program Files\OpenSSL-Win64 '
63
66
BOOST_LIBRARY_DIR : ' C:\local\boost_1_81_0\lib64-msvc-14.3'
64
67
BOOST_LIBRARYDIR : ' C:\local\boost_1_81_0\lib64-msvc-14.3'
65
68
with :
Original file line number Diff line number Diff line change @@ -54,7 +54,6 @@ if (BUILD_TESTING)
54
54
endif ()
55
55
56
56
set (OPENSSL_USE_STATIC_LIBS ON )
57
- set (
OPENSSL_ROOT_DIR "/opt/homebrew/opt/[email protected] " )
58
57
find_package (OpenSSL REQUIRED )
59
58
message (STATUS "LaunchDarkly: using OpenSSL v${OPENSSL_VERSION} " )
60
59
You can’t perform that action at this time.
0 commit comments