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.
facebook · Sep 24, 2020 · 209016c · 209016c
1 parent eea2b56
commit 209016c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/eden_scm_lib_edenapi_tools_mac.yml b/.github/workflows/eden_scm_lib_edenapi_tools_mac.yml
@@ -13,8 +13,6 @@ on:
 jobs:
   build:
     runs-on: macOS-latest
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_10.3.app/Contents/Developer
     steps:
     - uses: actions/checkout@v1
     - name: Install Rust Stable

diff --git a/.github/workflows/edenscm_mac.yml b/.github/workflows/edenscm_mac.yml
@@ -13,8 +13,6 @@ on:
 jobs:
   build:
     runs-on: macOS-latest
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_10.3.app/Contents/Developer
     steps:
     - uses: actions/checkout@v1
     - name: Install Rust Stable

diff --git a/.github/workflows/mononoke-integration_mac.yml b/.github/workflows/mononoke-integration_mac.yml
@@ -11,8 +11,6 @@ on:
 jobs:
   tests:
     runs-on: macOS-latest
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_10.3.app/Contents/Developer
     steps:
     - uses: actions/checkout@v1
     - name: Check space
@@ -35,9 +33,16 @@ jobs:
       run: |
         brew install bash coreutils curl-openssl gnu-sed grep jq nmap tree
     - name: Install system deps
-      run: sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive eden_scm
+      run: >-
+        export PATH="/usr/local/opt/curl-openssl/bin:$PATH";
+        sudo python3 build/fbcode_builder/getdeps.py
+        --allow-system-packages
+        install-system-deps
+        --recursive
+        eden_scm
     - name: Build eden_scm dependencies
       run: >-
+        export PATH="/usr/local/opt/curl-openssl/bin:$PATH";
         python3 build/fbcode_builder/getdeps.py build
         --allow-system-packages
         --scratch-path /tmp/build
@@ -46,6 +51,7 @@ jobs:
         eden_scm
     - name: Build eden_scm
       run: >-
+        export PATH="/usr/local/opt/curl-openssl/bin:$PATH";
         python3 build/fbcode_builder/getdeps.py build
         --allow-system-packages
         --scratch-path /tmp/build
@@ -54,6 +60,7 @@ jobs:
         eden_scm
     - name: Build eden_scm_lib_edenapi_tools
       run: >-
+        export PATH="/usr/local/opt/curl-openssl/bin:$PATH";
         python3 build/fbcode_builder/getdeps.py build
         --allow-system-packages
         --scratch-path /tmp/build
@@ -62,6 +69,7 @@ jobs:
         eden_scm_lib_edenapi_tools
     - name: Build mononoke dependencies
       run: >-
+        export PATH="/usr/local/opt/curl-openssl/bin:$PATH";
         python3 build/fbcode_builder/getdeps.py build
         --allow-system-packages
         --scratch-path /tmp/build
@@ -70,6 +78,7 @@ jobs:
         mononoke
     - name: Build mononoke
       run: >-
+        export PATH="/usr/local/opt/curl-openssl/bin:$PATH";
         python3 build/fbcode_builder/getdeps.py build
         --allow-system-packages
         --scratch-path /tmp/build

diff --git a/.github/workflows/mononoke_mac.yml b/.github/workflows/mononoke_mac.yml
@@ -11,8 +11,6 @@ on:
 jobs:
   build:
     runs-on: macOS-latest
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_10.3.app/Contents/Developer
     steps:
     - uses: actions/checkout@v1
     - name: Check space

diff --git a/build/fbcode_builder/getdeps/buildopts.py b/build/fbcode_builder/getdeps/buildopts.py
@@ -269,12 +269,10 @@ def compute_env_for_install_dirs(self, install_dirs, env=None, manifest=None):
                 env["RUSTC"] = rustc_path
                 env["RUSTDOC"] = rustdoc_path
 
-            if self.is_windows():
-                libcrypto = os.path.join(d, "lib/libcrypto.lib")
-            else:
-                libcrypto = os.path.join(d, "lib/libcrypto.so")
             openssl_include = os.path.join(d, "include/openssl")
-            if os.path.isfile(libcrypto) and os.path.isdir(openssl_include):
+            if os.path.isdir(openssl_include) and any(
+                os.path.isfile(os.path.join(d, "lib", libcrypto))
+                for libcrypto in ("libcrypto.lib", "libcrypto.so", "libcrypto.a")):
                 # This must be the openssl library, let Rust know about it
                 env["OPENSSL_DIR"] = d