Skip to content

Commit 209016c

Browse files
mononoke/integration: build EdenSCM with getdeps provided OpenSSL
The OpenSSL version on Mac doesn't work well with EdenSCM and Mononoke integration, just use the one from getdeps.
1 parent eea2b56 commit 209016c

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
lines changed

.github/workflows/eden_scm_lib_edenapi_tools_mac.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ on:
1313
jobs:
1414
build:
1515
runs-on: macOS-latest
16-
env:
17-
DEVELOPER_DIR: /Applications/Xcode_10.3.app/Contents/Developer
1816
steps:
1917
- uses: actions/checkout@v1
2018
- name: Install Rust Stable

.github/workflows/edenscm_mac.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ on:
1313
jobs:
1414
build:
1515
runs-on: macOS-latest
16-
env:
17-
DEVELOPER_DIR: /Applications/Xcode_10.3.app/Contents/Developer
1816
steps:
1917
- uses: actions/checkout@v1
2018
- name: Install Rust Stable

.github/workflows/mononoke-integration_mac.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ on:
1111
jobs:
1212
tests:
1313
runs-on: macOS-latest
14-
env:
15-
DEVELOPER_DIR: /Applications/Xcode_10.3.app/Contents/Developer
1614
steps:
1715
- uses: actions/checkout@v1
1816
- name: Check space
@@ -35,9 +33,16 @@ jobs:
3533
run: |
3634
brew install bash coreutils curl-openssl gnu-sed grep jq nmap tree
3735
- name: Install system deps
38-
run: sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive eden_scm
36+
run: >-
37+
export PATH="/usr/local/opt/curl-openssl/bin:$PATH";
38+
sudo python3 build/fbcode_builder/getdeps.py
39+
--allow-system-packages
40+
install-system-deps
41+
--recursive
42+
eden_scm
3943
- name: Build eden_scm dependencies
4044
run: >-
45+
export PATH="/usr/local/opt/curl-openssl/bin:$PATH";
4146
python3 build/fbcode_builder/getdeps.py build
4247
--allow-system-packages
4348
--scratch-path /tmp/build
@@ -46,6 +51,7 @@ jobs:
4651
eden_scm
4752
- name: Build eden_scm
4853
run: >-
54+
export PATH="/usr/local/opt/curl-openssl/bin:$PATH";
4955
python3 build/fbcode_builder/getdeps.py build
5056
--allow-system-packages
5157
--scratch-path /tmp/build
@@ -54,6 +60,7 @@ jobs:
5460
eden_scm
5561
- name: Build eden_scm_lib_edenapi_tools
5662
run: >-
63+
export PATH="/usr/local/opt/curl-openssl/bin:$PATH";
5764
python3 build/fbcode_builder/getdeps.py build
5865
--allow-system-packages
5966
--scratch-path /tmp/build
@@ -62,6 +69,7 @@ jobs:
6269
eden_scm_lib_edenapi_tools
6370
- name: Build mononoke dependencies
6471
run: >-
72+
export PATH="/usr/local/opt/curl-openssl/bin:$PATH";
6573
python3 build/fbcode_builder/getdeps.py build
6674
--allow-system-packages
6775
--scratch-path /tmp/build
@@ -70,6 +78,7 @@ jobs:
7078
mononoke
7179
- name: Build mononoke
7280
run: >-
81+
export PATH="/usr/local/opt/curl-openssl/bin:$PATH";
7382
python3 build/fbcode_builder/getdeps.py build
7483
--allow-system-packages
7584
--scratch-path /tmp/build

.github/workflows/mononoke_mac.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ on:
1111
jobs:
1212
build:
1313
runs-on: macOS-latest
14-
env:
15-
DEVELOPER_DIR: /Applications/Xcode_10.3.app/Contents/Developer
1614
steps:
1715
- uses: actions/checkout@v1
1816
- name: Check space

build/fbcode_builder/getdeps/buildopts.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -269,12 +269,10 @@ def compute_env_for_install_dirs(self, install_dirs, env=None, manifest=None):
269269
env["RUSTC"] = rustc_path
270270
env["RUSTDOC"] = rustdoc_path
271271

272-
if self.is_windows():
273-
libcrypto = os.path.join(d, "lib/libcrypto.lib")
274-
else:
275-
libcrypto = os.path.join(d, "lib/libcrypto.so")
276272
openssl_include = os.path.join(d, "include/openssl")
277-
if os.path.isfile(libcrypto) and os.path.isdir(openssl_include):
273+
if os.path.isdir(openssl_include) and any(
274+
os.path.isfile(os.path.join(d, "lib", libcrypto))
275+
for libcrypto in ("libcrypto.lib", "libcrypto.so", "libcrypto.a")):
278276
# This must be the openssl library, let Rust know about it
279277
env["OPENSSL_DIR"] = d
280278

0 commit comments

Comments
 (0)