From 940613c11a89c2c8f8dfbec483b3953cb8a101b6 Mon Sep 17 00:00:00 2001
From: Cary Phillips <cary@ilm.com>
Date: Thu, 21 Nov 2024 07:45:09 -0800
Subject: [PATCH] validate=OFF

Signed-off-by: Cary Phillips <cary@ilm.com>
---
 .github/workflows/ci_steps.yml                    |  2 --
 .github/workflows/ci_workflow.yml                 | 15 ++++++++-------
 ...buntu.7.txt => install_manifest.ubuntu.10.txt} |  0
 3 files changed, 8 insertions(+), 9 deletions(-)
 rename share/ci/install_manifest/{install_manifest.ubuntu.7.txt => install_manifest.ubuntu.10.txt} (100%)

diff --git a/.github/workflows/ci_steps.yml b/.github/workflows/ci_steps.yml
index 3ed423b7b..d9fe70ef0 100644
--- a/.github/workflows/ci_steps.yml
+++ b/.github/workflows/ci_steps.yml
@@ -141,7 +141,6 @@ jobs:
         shell: bash
 
       - name: Prepare install_manifest
-        if: ${{ inputs.validate_install != 'OFF' }}
         # Store the cmake command as the first line of the manifest,
         # and remove the path prefix, so the manifest contains only
         # the local filenames.
@@ -151,7 +150,6 @@ jobs:
         shell: bash
 
       - name: Upload install_manifest.txt
-        if: ${{ inputs.validate_install != 'OFF' }}
         # Upload the manifest to make it possible to download for inspection and debugging
         uses: actions/upload-artifact@v3
         with:
diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml
index ba521fd39..244b7435c 100644
--- a/.github/workflows/ci_workflow.yml
+++ b/.github/workflows/ci_workflow.yml
@@ -113,22 +113,23 @@ jobs:
             namespace: XXX
 
           - build: 7
+            label: clang
+            cxx-compiler: clang++
+            cc-compiler: clang
+            validate_install: OFF
+
+          - build: 8
             label: vfx2023
             vfx-cy: 2023
 
-          - build: 8
+          - build: 9
             label: vfx2022
             vfx-cy: 2022
 
-          - build: 9
+          - build: 10
             label: vfx2021
             vfx-cy: 2021
 
-          - build: 10
-            label: clang
-            cxx-compiler: clang++
-            cc-compiler: clang
-
   macOS:
     name: 'macOS.${{ matrix.build}}: ${{ matrix.label }}'
     uses: ./.github/workflows/ci_steps.yml
diff --git a/share/ci/install_manifest/install_manifest.ubuntu.7.txt b/share/ci/install_manifest/install_manifest.ubuntu.10.txt
similarity index 100%
rename from share/ci/install_manifest/install_manifest.ubuntu.7.txt
rename to share/ci/install_manifest/install_manifest.ubuntu.10.txt