Skip to content

Commit

Permalink
fix runner debug checks, upload entire src on failure as last step, c…
Browse files Browse the repository at this point in the history
…hange how we do our master gnulib repo checks
  • Loading branch information
mitchcapper committed Dec 18, 2024
1 parent d8f6529 commit 52e73aa
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 7 deletions.
12 changes: 7 additions & 5 deletions .github/gnu_patchtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,19 @@ PATCH_NAME="$2"
. "${WLB_SCRIPT_FOLDER:-$(dirname "$(readlink -f "$BASH_SOURCE")")}/helpers.sh"

BLD_CONFIG_BUILD_NAME="gnulib";
BLD_CONFIG_GNU_LIBS_USED=1;
BLD_CONFIG_LOG_FILE_AUTOTAIL=0;
function ourmain() {
startcommon;
set -e
git config --global user.email "[email protected]"
git config --global user.name "Your Name"
git clone --quiet "--dissociate" "--reference" "${BLD_CONFIG_GNU_LIB_REFERENCE_SOURCE_DIR}" https://github.com/mitchcapper/gnulib .
git remote add upstream https://github.com/coreutils/gnulib.git
git fetch upstream --quiet
git checkout master --quiet
git branch master -u upstream/master
git_clone --no-checkout --no-recurse-submodules --quiet --use-ref-src https://github.com/coreutils/gnulib.git .
git remote add ours https://github.com/mitchcapper/gnulib
git ours upstream --quiet --all
git branch -D master
git checkout ours/master --quiet
git branch master -u origin/master
git pull
TEST_WHAT="$SKIP_STEP"
BRANCH_NAME="ours_${PATCH_NAME,,}"
Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/do_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ on:
env:
CI_REQ_DOTNET_SDK_VER: 6.0.401
NUKE_TELEMETRY_OPTOUT: 1
BLD_CONFIG_GIT_PRINT_LAST_COMMIT_ON_CLONE: 1
MSYS: "winsymlinks:native wincmdln"
MSYS2_ARG_CONV_EXCL: "*"
MSYS2_PATH_TYPE: inherit
Expand Down Expand Up @@ -153,12 +154,21 @@ jobs:
run: ${{env.WLB_SCRIPT_FOLDER}}/vs_msys_shell_launch.ps1 "${{env.WLB_SCRIPT_FOLDER}}/${{env.SCRIPT}}"

- name: Debug Session
if: ${{ failure() && (vars.DEBUG_FAIL == '1') && (vars.ACTIONS_RUNNER_DEBUG == true) }}
if: ${{ failure() && (vars.DEBUG_FAIL == '1') && (runner.debug) }}
run: ${{env.WLB_SCRIPT_FOLDER}}/.github/debug_ssh_start.ps1

- uses: actions/[email protected]
- name: Failure Artifact Upload
if: ${{ failure() && (runner.debug) }}
uses: actions/upload-artifact@v4
with:
name: FAILURE-${{env.BUILD_PKG}}${{matrix.Configuration=='Debug' && '-Debug' || ''}}
retention-days: 2
path: ${{env.WLB_BASE_FOLDER}}/${{env.BUILD_PKG}}

- uses: actions/upload-artifact@v4
if: ${{ inputs.BuildPkg != 'script' }}
with:
name: WLB-${{env.BUILD_PKG}}${{matrix.Configuration=='Debug' && '-Debug' || ''}}
path: ${{env.WLB_BASE_FOLDER}}/${{env.BUILD_PKG}}/final
if-no-files-found: error

0 comments on commit 52e73aa

Please sign in to comment.