fix fauxbuild

This commit is contained in:
humbletim
2025-06-02 15:42:02 -04:00
parent 4d1c080e61
commit f02f476c16
3 changed files with 26 additions and 9 deletions
+22 -8
View File
@@ -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
+3 -1
View File
@@ -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
(
+1
View File
@@ -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 \