pass --allow-system-packages to getdeps.py build of Mononoke

facebook · Jul 16, 2020 · 073240d · 073240d
1 parent 0dd3c4e
commit 073240d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 14 deletions.
diff --git a/.github/workflows/mononoke-integration_linux.yml b/.github/workflows/mononoke-integration_linux.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Install Rust Stable
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: stable
+        toolchain: 1.44.0
         default: true
         profile: minimal
     - name: Install Python 2.7
@@ -50,13 +50,15 @@ jobs:
     - name: Build mononoke dependencies
       run: >-
         python3 build/fbcode_builder/getdeps.py build
+        --allow-system-packages
         --scratch-path /tmp/build
         --only-deps
         --src-dir=.
         mononoke
     - name: Build mononoke
       run: >-
         python3 build/fbcode_builder/getdeps.py build
+        --allow-system-packages
         --scratch-path /tmp/build
         --no-deps
         --src-dir=.

diff --git a/.github/workflows/mononoke-integration_mac.yml b/.github/workflows/mononoke-integration_mac.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Install Rust Stable
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: stable
+        toolchain: 1.44.0
         default: true
         profile: minimal
     - name: Install Python 2.7
@@ -48,13 +48,15 @@ jobs:
     - name: Build mononoke dependencies
       run: >-
         python3 build/fbcode_builder/getdeps.py build
+        --allow-system-packages
         --scratch-path /tmp/build
         --only-deps
         --src-dir=.
         mononoke
     - name: Build mononoke
       run: >-
         python3 build/fbcode_builder/getdeps.py build
+        --allow-system-packages
         --scratch-path /tmp/build
         --no-deps
         --src-dir=.

diff --git a/.github/workflows/mononoke_linux.yml b/.github/workflows/mononoke_linux.yml
@@ -22,17 +22,19 @@ jobs:
     - name: Install Rust Stable
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: stable
+        toolchain: 1.44.0
         default: true
         profile: minimal
+    - name: Install system deps
+      run: sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive mononoke
     - name: Build dependencies
-      run: python3 build/fbcode_builder/getdeps.py build --only-deps --src-dir=. mononoke
+      run: python3 build/fbcode_builder/getdeps.py build --allow-system-packages --only-deps --src-dir=. mononoke
     - name: Build mononoke
-      run: python3 build/fbcode_builder/getdeps.py build --no-deps --src-dir=. mononoke
+      run: python3 build/fbcode_builder/getdeps.py build --allow-system-packages --no-deps --src-dir=. mononoke
     - name: Check space
       run: df -h
     - name: Test mononoke
-      run: python3 build/fbcode_builder/getdeps.py test --src-dir=. mononoke
+      run: python3 build/fbcode_builder/getdeps.py test --allow-system-packages --src-dir=. mononoke
     - name: Check space
       run: df -h
     - name: Install Rust Beta
@@ -42,7 +44,7 @@ jobs:
         default: true
         profile: minimal
     - name: Test mononoke with beta toolchain
-      run: python3 build/fbcode_builder/getdeps.py test --src-dir=. mononoke
+      run: python3 build/fbcode_builder/getdeps.py test --allow-system-packages --src-dir=. mononoke
       continue-on-error: true
     - name: Install Rust Nightly
       uses: actions-rs/toolchain@v1
@@ -51,7 +53,7 @@ jobs:
         default: true
         profile: minimal
     - name: Test mononoke with nightly toolchain
-      run: python3 build/fbcode_builder/getdeps.py test --src-dir=. mononoke
+      run: python3 build/fbcode_builder/getdeps.py test --allow-system-packages --src-dir=. mononoke
       continue-on-error: true
     - name: Check space
       run: df -h
diff --git a/.github/workflows/mononoke_mac.yml b/.github/workflows/mononoke_mac.yml
@@ -20,17 +20,20 @@ jobs:
     - name: Install Rust Stable
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: stable
+        toolchain: 1.44.0
         default: true
         profile: minimal
+    - name: Install system deps
+      run: sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive monono
+ke
     - name: Build dependencies
-      run: python3 build/fbcode_builder/getdeps.py build --only-deps --src-dir=. mononoke
+      run: python3 build/fbcode_builder/getdeps.py build --allow-system-packages --only-deps --src-dir=. mononoke
     - name: Build mononoke
-      run: python3 build/fbcode_builder/getdeps.py build --no-deps --src-dir=. mononoke
+      run: python3 build/fbcode_builder/getdeps.py build --allow-system-packages --no-deps --src-dir=. mononoke
     - name: Check space
       run: df -h
     - name: Test mononoke
-      run: python3 build/fbcode_builder/getdeps.py test --src-dir=. mononoke
+      run: python3 build/fbcode_builder/getdeps.py test --allow-system-packages --src-dir=. mononoke
     - name: Check space
       run: df -h
     - name: Install Rust Beta
@@ -40,7 +43,7 @@ jobs:
         default: true
         profile: minimal
     - name: Test mononoke with beta toolchain
-      run: python3 build/fbcode_builder/getdeps.py test --src-dir=. mononoke
+      run: python3 build/fbcode_builder/getdeps.py test --allow-system-packages --src-dir=. mononoke
       continue-on-error: true
     - name: Install Rust Nightly
       uses: actions-rs/toolchain@v1
@@ -49,7 +52,7 @@ jobs:
         default: true
         profile: minimal
     - name: Test mononoke with nightly toolchain
-      run: python3 build/fbcode_builder/getdeps.py test --src-dir=. mononoke
+      run: python3 build/fbcode_builder/getdeps.py test --allow-system-packages --src-dir=. mononoke
       continue-on-error: true
     - name: Check space
       run: df -h