Cherrypick ci improvements to 2.13.x (#16065)

Cherrypick of #15989, #16041, #16053
pantsbuild · Jul 5, 2022 · 9ecfb1b · 9ecfb1b
1 parent 3581606
commit 9ecfb1b
Show file tree

Hide file tree

Showing 5 changed files with 448 additions and 271 deletions.
diff --git a/.github/workflows/audit.yaml b/.github/workflows/audit.yaml
@@ -5,7 +5,7 @@
 
 jobs:
   audit:
-    if: ${{ github.repository_owner == 'pantsbuild' }}
+    if: github.repository_owner == 'pantsbuild'
     runs-on: ubuntu-latest
     steps:
     - name: Check out code

diff --git a/.github/workflows/cancel.yaml b/.github/workflows/cancel.yaml
@@ -5,7 +5,7 @@
 
 jobs:
   cancel:
-    if: ${{ github.repository_owner == 'pantsbuild' }}
+    if: github.repository_owner == 'pantsbuild'
     runs-on: ubuntu-latest
     steps:
     - uses: styfle/cancel-workflow-action@0.9.1

diff --git a/.github/workflows/test-cron.yaml b/.github/workflows/test-cron.yaml
@@ -7,13 +7,12 @@ env:
   PANTS_CONFIG_FILES: +['pants.ci.toml']
   RUST_BACKTRACE: all
 jobs:
-  bootstrap_pants_linux:
+  bootstrap_pants_linux_x86_64:
     env:
       PANTS_REMOTE_CACHE_READ: 'false'
       PANTS_REMOTE_CACHE_WRITE: 'false'
-    if: ${{ github.repository_owner == 'pantsbuild' }}
+    if: github.repository_owner == 'pantsbuild'
     name: Bootstrap Pants, test and lint Rust (Linux-x86_64)
-    needs: check_labels
     runs-on:
     - ubuntu-20.04
     steps:
@@ -150,13 +149,12 @@ jobs:
         - '3.8'
         - '3.9'
     timeout-minutes: 40
-  bootstrap_pants_macos:
+  bootstrap_pants_macos_x86_64:
     env:
       PANTS_REMOTE_CACHE_READ: 'false'
       PANTS_REMOTE_CACHE_WRITE: 'false'
-    if: ${{ github.repository_owner == 'pantsbuild' }}
+    if: github.repository_owner == 'pantsbuild'
     name: Bootstrap Pants, test Rust (macOS10-x86_64)
-    needs: check_labels
     runs-on:
     - macos-10.15
     steps:
@@ -288,9 +286,8 @@ jobs:
       ARCHFLAGS: -arch arm64
       PANTS_REMOTE_CACHE_READ: 'false'
       PANTS_REMOTE_CACHE_WRITE: 'false'
-    if: ${{ github.repository_owner == 'pantsbuild' }}
+    if: github.repository_owner == 'pantsbuild'
     name: Bootstrap Pants, build wheels and fs_util (macOS11-ARM64)
-    needs: check_labels
     runs-on:
     - self-hosted
     - macOS11
@@ -405,7 +402,7 @@ jobs:
 
           src/python/pants/engine/internals/native_engine.so.metadata'
     - if: (github.event_name == 'push' || !contains(env.COMMIT_MESSAGE, '[ci skip-build-wheels]'))
-        && (${{ github.repository_owner == 'pantsbuild' }})
+        && (github.repository_owner == 'pantsbuild')
       name: Build wheels
       run: USE_PY39=true arch -arm64 ./build-support/bin/release.sh build-wheels
     - if: github.event_name == 'push'
@@ -423,7 +420,7 @@ jobs:
         - '3.9'
     timeout-minutes: 60
   check_labels:
-    if: ${{ github.repository_owner == 'pantsbuild' }}
+    if: github.repository_owner == 'pantsbuild'
     name: Ensure PR has a category label
     runs-on:
     - ubuntu-20.04
@@ -439,9 +436,9 @@ jobs:
           change, category:performance, category:bugfix, category:documentation, category:internal
         mode: exactly
   lint_python:
-    if: ${{ github.repository_owner == 'pantsbuild' }}
+    if: github.repository_owner == 'pantsbuild'
     name: Lint Python and Shell
-    needs: bootstrap_pants_linux
+    needs: bootstrap_pants_linux_x86_64
     runs-on:
     - ubuntu-20.04
     steps:
@@ -497,18 +494,18 @@ jobs:
       name: Upload pants.log
       uses: actions/upload-artifact@v3
       with:
-        name: pants-log-lint
+        name: pants-log-lint-Linux-x86_64
         path: .pants.d/pants.log
     strategy:
       matrix:
         python-version:
         - '3.8'
         - '3.9'
     timeout-minutes: 30
-  test_python_linux_0:
-    if: ${{ github.repository_owner == 'pantsbuild' }}
+  test_python_linux_x86_64_0:
+    if: github.repository_owner == 'pantsbuild'
     name: Test Python (Linux-x86_64) Shard 0/3
-    needs: bootstrap_pants_linux
+    needs: bootstrap_pants_linux_x86_64
     runs-on:
     - ubuntu-20.04
     steps:
@@ -585,18 +582,18 @@ jobs:
       name: Upload pants.log
       uses: actions/upload-artifact@v3
       with:
-        name: pants-log-python-test-linux-0_3
+        name: pants-log-python-test-0_3-Linux-x86_64
         path: .pants.d/pants.log
     strategy:
       matrix:
         python-version:
         - '3.8'
         - '3.9'
     timeout-minutes: 90
-  test_python_linux_1:
-    if: ${{ github.repository_owner == 'pantsbuild' }}
+  test_python_linux_x86_64_1:
+    if: github.repository_owner == 'pantsbuild'
     name: Test Python (Linux-x86_64) Shard 1/3
-    needs: bootstrap_pants_linux
+    needs: bootstrap_pants_linux_x86_64
     runs-on:
     - ubuntu-20.04
     steps:
@@ -673,18 +670,18 @@ jobs:
       name: Upload pants.log
       uses: actions/upload-artifact@v3
       with:
-        name: pants-log-python-test-linux-1_3
+        name: pants-log-python-test-1_3-Linux-x86_64
         path: .pants.d/pants.log
     strategy:
       matrix:
         python-version:
         - '3.8'
         - '3.9'
     timeout-minutes: 90
-  test_python_linux_2:
-    if: ${{ github.repository_owner == 'pantsbuild' }}
+  test_python_linux_x86_64_2:
+    if: github.repository_owner == 'pantsbuild'
     name: Test Python (Linux-x86_64) Shard 2/3
-    needs: bootstrap_pants_linux
+    needs: bootstrap_pants_linux_x86_64
     runs-on:
     - ubuntu-20.04
     steps:
@@ -761,20 +758,20 @@ jobs:
       name: Upload pants.log
       uses: actions/upload-artifact@v3
       with:
-        name: pants-log-python-test-linux-2_3
+        name: pants-log-python-test-2_3-Linux-x86_64
         path: .pants.d/pants.log
     strategy:
       matrix:
         python-version:
         - '3.8'
         - '3.9'
     timeout-minutes: 90
-  test_python_macos:
+  test_python_macos_x86_64:
     env:
       ARCHFLAGS: -arch x86_64
-    if: ${{ github.repository_owner == 'pantsbuild' }}
+    if: github.repository_owner == 'pantsbuild'
     name: Test Python (macOS10-x86_64)
-    needs: bootstrap_pants_macos
+    needs: bootstrap_pants_macos_x86_64
     runs-on:
     - macos-10.15
     steps:
@@ -833,7 +830,7 @@ jobs:
       name: Upload pants.log
       uses: actions/upload-artifact@v3
       with:
-        name: pants-log-python-test-macos
+        name: pants-log-python-test-macOS10-x86_64
         path: .pants.d/pants.log
     strategy:
       matrix: