From 76f3e68f7013c22f6b61ef7c8328687631283d9a Mon Sep 17 00:00:00 2001
From: spencer-lunarg <spencer@lunarg.com>
Date: Tue, 27 Aug 2024 13:01:20 -0400
Subject: [PATCH] ci: Add some job dependency

---
 .github/workflows/formatting.yml | 40 --------------------------------
 .github/workflows/vvl.yml        | 25 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 40 deletions(-)
 delete mode 100644 .github/workflows/formatting.yml

diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml
deleted file mode 100644
index 4b1927c812f..00000000000
--- a/.github/workflows/formatting.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) 2023 Valve Corporation
-# Copyright (c) 2023 LunarG, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: Formatting
-
-on:
-    push:
-    pull_request:
-        branches:
-            - main
-
-permissions:
-  contents: read
-
-jobs:
-  code-format:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: '0'
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
-      - name: clang-format version
-        run: clang-format --version
-      - name: Execute Source Code Format Checking Script
-        run: python3 scripts/check_code_format.py --fetch-main --target-refspec=FETCH_HEAD
diff --git a/.github/workflows/vvl.yml b/.github/workflows/vvl.yml
index 6c16ef35a83..496c9b6a307 100644
--- a/.github/workflows/vvl.yml
+++ b/.github/workflows/vvl.yml
@@ -35,8 +35,23 @@ permissions:
   contents: read
 
 jobs:
+  code-format:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: '0'
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+      - name: clang-format version
+        run: clang-format --version
+      - name: Execute Source Code Format Checking Script
+        run: python3 scripts/check_code_format.py --fetch-main --target-refspec=FETCH_HEAD
+
   # Ensure we can build on an older Ubuntu distro with an older version of CMake.
   linux_back_compat:
+    needs: check_vvl
     runs-on: ubuntu-20.04
     name: "Ubuntu Backcompat"
     steps:
@@ -59,6 +74,7 @@ jobs:
       - run: cmake --install build --prefix /tmp
 
   linux:
+    needs: check_vvl
     runs-on: ubuntu-22.04
     name: "linux (${{matrix.sanitize}} sanitizer, ${{matrix.config}}, robinhood ${{matrix.robin_hood}} )"
     strategy:
@@ -133,6 +149,7 @@ jobs:
           retention-days: 3
 
   androidOnLinux:
+    needs: check_vvl
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -157,6 +174,7 @@ jobs:
           VK_KHRONOS_PROFILES_PROFILE_FILE: ${{ github.workspace }}/tests/device_profiles/max_profile.json
 
   windows:
+    needs: check_vvl
     runs-on: windows-2022
     strategy:
       matrix:
@@ -221,6 +239,7 @@ jobs:
           retention-days: 3
 
   android:
+      needs: check_vvl
       runs-on: ubuntu-22.04
       strategy:
         matrix:
@@ -293,6 +312,9 @@ jobs:
             retention-days: 3
 
   iOS:
+    # iOS is 10x expensive to run on GitHub machines, so only run if we know something else fast/simple passed as well
+    # androidOnLinux does a basic build and only takes a 2 or 3 minutes to normally run
+    needs: androidOnLinux
     runs-on: macos-12
     steps:
       - uses: actions/checkout@v4
@@ -324,6 +346,7 @@ jobs:
       - run: vtool -show-build /tmp/lib/VkLayer_khronos_validation.framework/VkLayer_khronos_validation
 
   mingw:
+    needs: check_vvl
     runs-on: windows-latest
     defaults:
       run:
@@ -351,6 +374,7 @@ jobs:
       - run: cmake --install build --prefix /tmp
 
   chromium:
+    needs: check_vvl
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -363,6 +387,7 @@ jobs:
       - run: python scripts/gn/gn.py --args='${{ matrix.args }}'
 
   check_vvl:
+    needs: code-format
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4