浏览代码

Merge branch 'master' into insider

Baptiste Augrain 2 年之前
父节点
当前提交
2ce1de5f4c
共有 2 个文件被更改,包括 4 次插入8 次删除
  1. 0 8
      .github/workflows/insider-spearhead.yml
  2. 4 0
      prepare_vscode.sh

+ 0 - 8
.github/workflows/insider-spearhead.yml

@@ -4,14 +4,6 @@ on:
   workflow_dispatch:
   schedule:
     - cron: '0 0 * * *'
-  push:
-    branches: [ insider ]
-    paths-ignore:
-    - '**/*.md'
-  pull_request:
-    branches: [ insider ]
-    paths-ignore:
-    - '**/*.md'
 
 jobs:
   build:

+ 4 - 0
prepare_vscode.sh

@@ -74,11 +74,15 @@ fi
 cp product.json product.json.bak
 
 setpath() {
+  { set +x; } 2>/dev/null
   echo "$( cat "${1}.json" | jq --arg 'path' "${2}" --arg 'value' "${3}" 'setpath([$path]; $value)' )" > "${1}.json"
+  set -x
 }
 
 setpath_json() {
+  { set +x; } 2>/dev/null
   echo "$( cat "${1}.json" | jq --arg 'path' "${2}" --argjson 'value' "${3}" 'setpath([$path]; $value)' )" > "${1}.json"
+  set -x
 }
 
 # set fields in product.json