Forráskód Böngészése

fix: don't checkout insider for stable [skip ci]

Baptiste Augrain 1 éve
szülő
commit
efca1a2c2c
2 módosított fájl, 2 hozzáadás és 6 törlés
  1. 0 2
      .github/workflows/stable-spearhead.yml
  2. 2 4
      prepare_vscode.sh

+ 0 - 2
.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

+ 2 - 4
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