From efca1a2c2c8e81f0c846481baa3ffec1d69bae35 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Wed, 15 Nov 2023 20:45:18 +0100 Subject: [PATCH] fix: don't checkout insider for stable [skip ci] --- .github/workflows/stable-spearhead.yml | 2 -- prepare_vscode.sh | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/stable-spearhead.yml b/.github/workflows/stable-spearhead.yml index 1f3ee9c..517f2c1 100644 --- a/.github/workflows/stable-spearhead.yml +++ b/.github/workflows/stable-spearhead.yml @@ -23,8 +23,6 @@ jobs: steps: - uses: actions/checkout@v4 - with: - ref: insider - name: Setup Node.js environment uses: actions/setup-node@v4 diff --git a/prepare_vscode.sh b/prepare_vscode.sh index fe29019..9914681 100755 --- a/prepare_vscode.sh +++ b/prepare_vscode.sh @@ -24,10 +24,8 @@ cd vscode || { echo "'vscode' dir not found"; exit 1; } for file in ../patches/*.patch; do if [[ -f "${file}" ]]; then echo applying patch: "${file}"; - - grep '^+++' "${file}" | sed -e 's#+++ [ab]/#./vscode/#' | while read line; do shasum -a 256 "${line}"; done - - if ! git apply --verbose --ignore-whitespace "${file}"; then + # grep '^+++' "${file}" | sed -e 's#+++ [ab]/#./vscode/#' | while read line; do shasum -a 256 "${line}"; done + if ! git apply --ignore-whitespace "${file}"; then echo failed to apply patch "${file}" >&2 exit 1 fi