From 73a99ea189508a9803bd9fa5eefdb566e6a267db Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Sun, 16 Mar 2025 11:16:10 +0100 Subject: [PATCH] build: fix compound bash conditional in patchup (#46059) Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr --- .github/actions/checkout/action.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/checkout/action.yml b/.github/actions/checkout/action.yml index d43907f07c19..446f06a7bc7b 100644 --- a/.github/actions/checkout/action.yml +++ b/.github/actions/checkout/action.yml @@ -99,7 +99,7 @@ runs: fi ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES=1 e d gclient sync --with_branch_heads --with_tags -vv - if [ "${{ inputs.is-release }}" != "true" && -n "${{ env.PATCH_UP_APP_CREDS }}" ]; then + if [[ "${{ inputs.is-release }}" != "true" && -n "${{ env.PATCH_UP_APP_CREDS }}" ]]; then # Re-export all the patches to check if there were changes. python3 src/electron/script/export_all_patches.py src/electron/patches/config.json cd src/electron @@ -128,6 +128,8 @@ runs: cat ../../patches/update-patches.patch exit 1 fi + else + echo "No changes to patches detected" fi fi