edenscm/hg: add GitHub Actions with CI for HG plus add fixes for getdeps

.github/workflows/edenscm-hg_linux.yml

@@ -0,0 +1,147 @@
+# This file was @generated by getdeps.py
+
+name: EdenSCM HG Linux
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
+
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v1
+    - name: Install Rust Stable
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        default: true
+        profile: minimal
+    - name: Install Python 2.7
+      uses: actions/setup-python@v2
+      with:
+        python-version: '2.7'
+    - name: Install system deps
+      run: sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive eden_scm
+    - name: Fetch fb303-source
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fb303-source
+    - name: Fetch fbthrift-source
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fbthrift-source
+    - name: Fetch openssl
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests openssl
+    - name: Fetch boost
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests boost
+    - name: Fetch ninja
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests ninja
+    - name: Fetch cmake
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests cmake
+    - name: Fetch fmt
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fmt
+    - name: Fetch googletest
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests googletest
+    - name: Fetch python-six
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests python-six
+    - name: Fetch zstd
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests zstd
+    - name: Fetch double-conversion
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests double-conversion
+    - name: Fetch gflags
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests gflags
+    - name: Fetch glog
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests glog
+    - name: Fetch libevent
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libevent
+    - name: Fetch lz4
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests lz4
+    - name: Fetch snappy
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests snappy
+    - name: Fetch folly
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests folly
+    - name: Fetch autoconf
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests autoconf
+    - name: Fetch automake
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests automake
+    - name: Fetch libtool
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libtool
+    - name: Fetch bison
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests bison
+    - name: Fetch libsodium
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libsodium
+    - name: Fetch fizz
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fizz
+    - name: Fetch flex
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests flex
+    - name: Fetch wangle
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests wangle
+    - name: Fetch fbthrift
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fbthrift
+    - name: Fetch rust-shed
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests rust-shed
+    - name: Build fb303-source
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fb303-source
+    - name: Build fbthrift-source
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fbthrift-source
+    - name: Build openssl
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests openssl
+    - name: Build boost
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests boost
+    - name: Build ninja
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests ninja
+    - name: Build cmake
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests cmake
+    - name: Build fmt
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fmt
+    - name: Build googletest
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests googletest
+    - name: Build python-six
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests python-six
+    - name: Build zstd
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests zstd
+    - name: Build double-conversion
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests double-conversion
+    - name: Build gflags
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests gflags
+    - name: Build glog
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests glog
+    - name: Build libevent
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libevent
+    - name: Build lz4
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests lz4
+    - name: Build snappy
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests snappy
+    - name: Build folly
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests folly
+    - name: Build autoconf
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests autoconf
+    - name: Build automake
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests automake
+    - name: Build libtool
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libtool
+    - name: Build bison
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests bison
+    - name: Build libsodium
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libsodium
+    - name: Build fizz
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fizz
+    - name: Build flex
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests flex
+    - name: Build wangle
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests wangle
+    - name: Build fbthrift
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fbthrift
+    - name: Build rust-shed
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests rust-shed
+    - name: Build eden_scm
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --src-dir=. eden_scm  --project-install-prefix eden_scm:/usr/local
+    - name: Copy artifacts
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fixup-dyn-deps --strip --src-dir=. eden_scm _artifacts/linux  --project-install-prefix eden_scm:/usr/local --final-install-prefix /usr/local
+    - uses: actions/upload-artifact@master
+      with:
+        name: eden_scm
+        path: _artifacts
+    - name: Test eden_scm
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages test --src-dir=. eden_scm  --project-install-prefix eden_scm:/usr/local

.github/workflows/edenscm-hg_mac.yml

@@ -0,0 +1,149 @@
+# This file was @generated by getdeps.py
+
+name: EdenSCM HG Mac
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
+
+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
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        default: true
+        profile: minimal
+    - name: Install Python 2.7
+      uses: actions/setup-python@v2
+      with:
+        python-version: '2.7'
+    - name: Install system deps
+      run: sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive eden_scm
+    - name: Fetch fb303-source
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fb303-source
+    - name: Fetch fbthrift-source
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fbthrift-source
+    - name: Fetch openssl
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests openssl
+    - name: Fetch boost
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests boost
+    - name: Fetch ninja
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests ninja
+    - name: Fetch cmake
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests cmake
+    - name: Fetch fmt
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fmt
+    - name: Fetch googletest
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests googletest
+    - name: Fetch python-six
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests python-six
+    - name: Fetch zstd
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests zstd
+    - name: Fetch double-conversion
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests double-conversion
+    - name: Fetch gflags
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests gflags
+    - name: Fetch glog
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests glog
+    - name: Fetch libevent
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libevent
+    - name: Fetch lz4
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests lz4
+    - name: Fetch snappy
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests snappy
+    - name: Fetch folly
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests folly
+    - name: Fetch autoconf
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests autoconf
+    - name: Fetch automake
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests automake
+    - name: Fetch libtool
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libtool
+    - name: Fetch bison
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests bison
+    - name: Fetch libsodium
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libsodium
+    - name: Fetch fizz
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fizz
+    - name: Fetch flex
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests flex
+    - name: Fetch wangle
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests wangle
+    - name: Fetch fbthrift
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fbthrift
+    - name: Fetch rust-shed
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests rust-shed
+    - name: Build fb303-source
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fb303-source
+    - name: Build fbthrift-source
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fbthrift-source
+    - name: Build openssl
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests openssl
+    - name: Build boost
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests boost
+    - name: Build ninja
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests ninja
+    - name: Build cmake
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests cmake
+    - name: Build fmt
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fmt
+    - name: Build googletest
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests googletest
+    - name: Build python-six
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests python-six
+    - name: Build zstd
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests zstd
+    - name: Build double-conversion
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests double-conversion
+    - name: Build gflags
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests gflags
+    - name: Build glog
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests glog
+    - name: Build libevent
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libevent
+    - name: Build lz4
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests lz4
+    - name: Build snappy
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests snappy
+    - name: Build folly
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests folly
+    - name: Build autoconf
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests autoconf
+    - name: Build automake
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests automake
+    - name: Build libtool
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libtool
+    - name: Build bison
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests bison
+    - name: Build libsodium
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libsodium
+    - name: Build fizz
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fizz
+    - name: Build flex
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests flex
+    - name: Build wangle
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests wangle
+    - name: Build fbthrift
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fbthrift
+    - name: Build rust-shed
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests rust-shed
+    - name: Build eden_scm
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --src-dir=. eden_scm  --project-install-prefix eden_scm:/usr/local
+    - name: Copy artifacts
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fixup-dyn-deps --src-dir=. eden_scm _artifacts/mac  --project-install-prefix eden_scm:/usr/local --final-install-prefix /usr/local
+    - uses: actions/upload-artifact@master
+      with:
+        name: eden_scm
+        path: _artifacts
+    - name: Test eden_scm
+      run: python3 build/fbcode_builder/getdeps.py --allow-system-packages test --src-dir=. eden_scm  --project-install-prefix eden_scm:/usr/local

build/fbcode_builder/getdeps/builder.py

@@ -990,7 +990,6 @@ def __init__(
     def run_cargo(self, install_dirs, operation, args=None):
         args = args or []
         env = self._compute_env(install_dirs)
-        self.add_openssl_to_env(env, install_dirs)
         # Enable using nightly features with stable compiler
         env["RUSTC_BOOTSTRAP"] = "1"
         env["LIBZ_SYS_STATIC"] = "1"
@@ -1002,17 +1001,6 @@ def run_cargo(self, install_dirs, operation, args=None):
         ] + args
         self._run_cmd(cmd, cwd=self.workspace_dir(), env=env)
 
-    def add_openssl_to_env(self, env, install_dirs):
-        openssl_candidates = [d for d in install_dirs if "openssl" in d]
-        if len(openssl_candidates) > 1:
-            raise Exception(
-                "Found more than one candidate for openssl directory: {}.".format(
-                    openssl_candidates
-                )
-            )
-        elif len(openssl_candidates) == 1:
-            env["OPENSSL_DIR"] = openssl_candidates[0]
-
     def build_source_dir(self):
         return os.path.join(self.build_dir, "source")
 

build/fbcode_builder/getdeps/buildopts.py

@@ -184,6 +184,9 @@ def compute_env_for_install_dirs(self, install_dirs, env=None, manifest=None):
         else:
             env = Env()
 
+        env["GETDEPS_BUILD_DIR"] = os.path.join(self.scratch_dir, "build")
+        env["GETDEPS_INSTALL_DIR"] = self.install_dir
+
         if self.fbsource_dir:
             env["YARN_YARN_OFFLINE_MIRROR"] = os.path.join(
                 self.fbsource_dir, "xplat/third-party/yarn/offline-mirror"
@@ -247,16 +250,25 @@ def compute_env_for_install_dirs(self, install_dirs, env=None, manifest=None):
             # If rustc is present in the `bin` directory, set RUSTC to prevent
             # cargo uses the rustc installed in the system.
             if self.is_windows():
+                cargo_path = os.path.join(bindir, "cargo.bat")
                 rustc_path = os.path.join(bindir, "rustc.bat")
                 rustdoc_path = os.path.join(bindir, "rustdoc.bat")
             else:
+                cargo_path = os.path.join(bindir, "cargo")
                 rustc_path = os.path.join(bindir, "rustc")
                 rustdoc_path = os.path.join(bindir, "rustdoc")
 
             if os.path.isfile(rustc_path):
+                env["CARGO_BIN"] = cargo_path
                 env["RUSTC"] = rustc_path
                 env["RUSTDOC"] = rustdoc_path
 
+            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):
+                # This must be the openssl library, let Rust know about it
+                env["OPENSSL_DIR"] = d
+
         return env