From f02f476c166452ba3eee1ef5a7288b1ecaaa2704 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Mon, 2 Jun 2025 15:42:02 -0400
Subject: [PATCH] fix fauxbuild

---
 .github/workflows/CompileWindows.yml        | 30 +++++++++++++++------
 blueprints/sl-7.1.14-2025.04/postbuild.bash |  4 ++-
 gha-populate-bin.bash                       |  1 +
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/CompileWindows.yml b/.github/workflows/CompileWindows.yml
index fcfcb56c3d..b21fbe6825 100644
--- a/.github/workflows/CompileWindows.yml
+++ b/.github/workflows/CompileWindows.yml
@@ -64,6 +64,14 @@ jobs:
          source $gha_fsvr_dir/gha-populate-bin.bash
          gha-populate-bin-windows
 
+    - name: Populate bin/yaml2json
+      if: fromJSON(inputs.fstuple).pause != '' && fromJSON(inputs.fstuple).pause != 'never'
+      uses: ./fsvr-action
+      with:
+        run: |
+         source $gha_fsvr_dir/gha-populate-bin.bash
+         get_yaml2json-windows
+
     - name: Expand Source Repositories
       uses: ./fsvr-action
       with:
@@ -224,8 +232,8 @@ jobs:
     - name: 090_ninja_preflight
       run: fsvr_step 090
 
-    - name: ~004 Setup tmate session
-      if: fromJSON(inputs.fstuple).pause == '004' || fromJSON(inputs.fstuple).pause == 'always'
+    - name: ~prebuild Setup tmate session
+      if: fromJSON(inputs.fstuple).pause == 'prebuild'
       uses: mxschmitt/action-tmate@v3
       with:
         limit-access-to-actor: true
@@ -242,16 +250,22 @@ jobs:
     - name: 0a1 postbuild
       run: fsvr_step 0a1
 
+      - name: ~postbuild Setup tmate session
+      if: fromJSON(inputs.fstuple).pause == 'postbuild'
+      uses: mxschmitt/action-tmate@v3
+      with:
+        limit-access-to-actor: true
+
     - name: 0a2 custom postbuild
       uses: ./fsvr-action
       with:
         run: fsvr_step 0a2
 
-    # - name: ~0a2 Setup tmate session
-    #   if: fromJSON(inputs.fstuple).pause == '0a2'
-    #   uses: mxschmitt/action-tmate@v3
-    #   with:
-    #     limit-access-to-actor: true
+    - name: ~postcustom Setup tmate session
+      if: fromJSON(inputs.fstuple).pause == 'postcustom'
+      uses: mxschmitt/action-tmate@v3
+      with:
+        limit-access-to-actor: true
 
     # - name: 0b0 installer
     #   if: fromJSON(inputs.fstuple).installer != 'false'
@@ -294,7 +308,7 @@ jobs:
     #       )"
 
     - name: ~Setup tmate session
-      if: (failure() && fromJSON(inputs.fstuple).pause != 'never') || fromJSON(inputs.fstuple).pause == 'always'
+      if: (failure() && fromJSON(inputs.fstuple).pause != 'never') || fromJSON(inputs.fstuple).pause == 'always' || fromJSON(inputs.fstuple).pause == 'finally'
       uses: mxschmitt/action-tmate@v3
       with:
         limit-access-to-actor: true
diff --git a/blueprints/sl-7.1.14-2025.04/postbuild.bash b/blueprints/sl-7.1.14-2025.04/postbuild.bash
index f842d854a4..06f248fee3 100644
--- a/blueprints/sl-7.1.14-2025.04/postbuild.bash
+++ b/blueprints/sl-7.1.14-2025.04/postbuild.bash
@@ -80,7 +80,9 @@ echo "SNAPSHOT CORRESPONDING SOURCE..." >&2
 mkdir -pv $snapshot_dir/source
 cp -ua $source_dir/../LICENSE $snapshot_dir/
 
-cp -ua $build_dir/newview/fsversionvalues.h $snapshot_dir/source/ || true
+if [[ $viewer_bin == firestorm ]] ; then
+    cp -ua $build_dir/newview/fsversionvalues.h $snapshot_dir/source/ || true
+fi
 cp -ua $build_dir/newview/viewerRes.rc $snapshot_dir/source/ || true
 
 (
diff --git a/gha-populate-bin.bash b/gha-populate-bin.bash
index aeb0ed5802..e7fab57755 100644
--- a/gha-populate-bin.bash
+++ b/gha-populate-bin.bash
@@ -53,6 +53,7 @@ function get_parallel() {(
 # yaml2json < fsvr/.github/workflows/CompileWindows.yml | jq '.jobs[].steps[]| "#"+.name+"\n"+.if+"\n"+(.run // .with.run)' -r
 function get_yaml2json-windows() {(
     echo "get_yaml2json-windows..." >&2
+    source $ghash/gha.wget-sha256.bash
     set -Euo pipefail
     local archive=$( wget-sha256 \
         a73fb27e36e30062c48dc0979c96afbbe25163e0899f6f259b654d56fda5cc26 \