From 78249a6378c220354822ce11933b1962fadcb6d6 Mon Sep 17 00:00:00 2001
From: Samuel Chiang <sachiang@amazon.com>
Date: Wed, 1 Nov 2023 09:46:16 -0700
Subject: [PATCH] Run basic test run before using expensive runners (#1270)

---
 .../workflows/{windows.yml => actions-ci.yml} | 68 ++++++++++++++++++-
 .github/workflows/osx.yml                     | 57 ----------------
 2 files changed, 65 insertions(+), 60 deletions(-)
 rename .github/workflows/{windows.yml => actions-ci.yml} (65%)
 delete mode 100644 .github/workflows/osx.yml

diff --git a/.github/workflows/windows.yml b/.github/workflows/actions-ci.yml
similarity index 65%
rename from .github/workflows/windows.yml
rename to .github/workflows/actions-ci.yml
index 706a331890..779b076d5a 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/actions-ci.yml
@@ -1,4 +1,4 @@
-name: Windows Tests
+name: AWS-LC CI Tests
 on:
   pull_request:
     branches: [ '*' ]
@@ -11,9 +11,68 @@ env:
   GOPROXY: https://proxy.golang.org,direct
   SDE_MIRROR_URL: "https://downloadmirror.intel.com/777395/sde-external-9.21.1-2023-04-24-win.tar.xz"
   SDE_VERSION_TAG: sde-external-9.21.1-2023-04-24-win
+  PACKAGE_NAME: aws-lc
+  # Used to enable ASAN test dimension.
+  AWSLC_NO_ASM_FIPS: 1
 
 jobs:
+  # MacOS and Windows GHA runners are more expensive, so we do a sanity test run before proceeding.
+  sanity-test-run:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Git clone the repository
+        uses: actions/checkout@v3
+      - name: Sanity Test Run
+        run: |
+          sudo apt-get install ninja-build
+          cmake -GNinja -Btest_build_dir
+          ninja -C test_build_dir run_tests
+
+  macOS-x86:
+    needs: [sanity-test-run]
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build ${{ env.PACKAGE_NAME }}
+        run: |
+          ./tests/ci/run_posix_tests.sh
+
+  macOS-x86-FIPS:
+    needs: [sanity-test-run]
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build ${{ env.PACKAGE_NAME }} with FIPS mode
+        run: |
+          ./tests/ci/run_fips_tests.sh
+
+  macOS-ARM:
+    needs: [sanity-test-run]
+    runs-on: macos-latest-xlarge
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: |
+          brew install ninja golang
+      - name: Build ${{ env.PACKAGE_NAME }}
+        run: |
+          ./tests/ci/run_posix_tests.sh
+
+  macOS-ARM-FIPS:
+    needs: [sanity-test-run]
+    runs-on: macos-latest-xlarge
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: |
+          brew install ninja golang
+      - name: Build ${{ env.PACKAGE_NAME }} with FIPS mode
+        run: |
+          ./tests/ci/run_fips_tests.sh
+
+
   MSVC-2019:
+    needs: [sanity-test-run]
     runs-on: temporary-performance-testing_windows-2019_8-core
     steps:
       - name: Git clone the repository
@@ -27,6 +86,7 @@ jobs:
           .\tests\ci\run_windows_tests.bat "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
 
   MSVC-2022:
+    needs: [sanity-test-run]
     runs-on: temporary-performance-testing_windows-latest_8-core
     steps:
       - name: Git clone the repository
@@ -39,7 +99,8 @@ jobs:
         run: |
           .\tests\ci\run_windows_tests.bat "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
 
-  SDE-64-bit:
+  MSVC-SDE-64-bit:
+    needs: [sanity-test-run]
     # TODO: Update this to run on windows-2022. windows-2022 (Windows 11) has phased out support for older processors.
     # https://learn.microsoft.com/en-us/windows-hardware/design/minimum/supported/windows-11-supported-intel-processors
     runs-on: temporary-performance-testing_windows-2019_64-core
@@ -67,7 +128,8 @@ jobs:
           echo ${env:SDEROOT}
           .\tests\ci\run_windows_tests.bat "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 true
 
-  SDE-32-bit:
+  MSVC-SDE-32-bit:
+    needs: [sanity-test-run]
     runs-on: temporary-performance-testing_windows-2019_64-core
     steps:
       - name: Git clone the repository
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
deleted file mode 100644
index fb941f2eed..0000000000
--- a/.github/workflows/osx.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-name: macOS CI
-
-# Workflow syntax.
-# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
-on:
-  pull_request:
-    branches:
-      - '*'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
-  cancel-in-progress: true
-
-env:
-  PACKAGE_NAME: aws-lc
-  # Used to enable ASAN test dimension.
-  AWSLC_NO_ASM_FIPS: 1
-
-jobs:
-  macOS:
-    runs-on: macos-11 # latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build ${{ env.PACKAGE_NAME }}
-      run: |
-        ./tests/ci/run_posix_tests.sh
-
-  macOS-FIPS:
-    runs-on: macos-11 # latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build ${{ env.PACKAGE_NAME }} with FIPS mode
-      run: |
-        ./tests/ci/run_fips_tests.sh
-
-  macOS-ARM:
-    runs-on: macos-latest-xlarge
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install dependencies
-      run: |
-        brew install ninja golang
-    - name: Build ${{ env.PACKAGE_NAME }}
-      run: |
-        ./tests/ci/run_posix_tests.sh
-
-  macOS-ARM-FIPS:
-    runs-on: macos-latest-xlarge
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install dependencies
-      run: |
-        brew install ninja golang
-    - name: Build ${{ env.PACKAGE_NAME }} with FIPS mode
-      run: |
-        ./tests/ci/run_fips_tests.sh
-