fix: actions for submodule

.github/workflows/flatpak-verify.yml

@@ -29,10 +29,13 @@ jobs:
       fail-fast: false
     steps:
     - uses: actions/checkout@v2
-    - name: Test
+      with:
+        submodules: 'recursive'
+    - name: Prepare
       run: |
+        yum install -y p7zip p7zip-plugins nodejs
+        cd compiler && npm install
         cat /etc/issue
-        yum install -y p7zip p7zip-plugins
         7z
     # Docker is required by the docker/setup-qemu-action which enables emulation
     - name: Install deps

.github/workflows/release.yml

@@ -22,16 +22,20 @@ jobs:
 
     strategy:
       matrix:
+        node-version: [16.x]
         ARCH: ['x86_64']
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v2
 
-      - name: Test
+      - name: Prepare
         run: |
+          cd compiler && npm install
           echo "$UID, $GID"
 
       - name: Generate TAG
@@ -109,6 +113,7 @@ jobs:
 
     strategy:
       matrix:
+        node-version: [16.x]
         ARCH: ['x86_64']
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
@@ -117,8 +122,9 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@v2
 
-      - name: Test
+      - name: Prepare
         run: |
+          cd compiler && npm install
           echo "$UID, $GID"
 
       - name: Generate TAG
@@ -143,6 +149,9 @@ jobs:
           mkdir -p tmp/build
           tools/build-prepare.sh
           tools/build-release.sh ${{ matrix.ARCH }} ${{ steps.tag.outputs.tag }}
+          export NO_WINE=true
+          tools/build-prepare.sh
+          tools/build-release.sh ${{ matrix.ARCH }} ${{ steps.tag.outputs.tag }}
 
       - name: View Directory
         run: |
@@ -224,6 +233,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v2
         with:
@@ -232,6 +243,7 @@ jobs:
 
       - name: Prepare
         run: |
+          cd compiler && npm install
           npm install node-gyp nw-gyp npm -g
           node-gyp install
           cat /etc/passwd
@@ -291,19 +303,26 @@ jobs:
     timeout-minutes: 30
     strategy:
       matrix:
+        node-version: [16.x]
         ARCH: ['x86_64']
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
       - name: Install Snapcraft
         uses: samuelmeuli/action-snapcraft@v1
         with:
           use_lxd: true
 
+      - name: Prepare
+        run: |
+          cd compiler && npm install
+
       # You can now run Snapcraft shell commands
       - name: Build snap
-        run:  sg lxd -c 'snapcraft --use-lxd'
+        run: sg lxd -c 'snapcraft --use-lxd'
 
       - name: move file
         run: |

compiler

@@ -1 +1 @@
-Subproject commit dbc6115f02446ea7ae4b9f62c89b1072b7acf433
+Subproject commit 0224d8b102f5f9103f1023a6fd68b97fe962b4f2

tools/build-release.sh

@@ -47,21 +47,10 @@ if [[ "$INPUT_VERSION" != "$DEVTOOLS_VERSION" ]];then
   exit 1
 fi
 
-for type in wine no_wine; do
-  notice "当前构建类型: $type";
-  if [[ $type == 'no_wine' ]];then
-    notice "no wine handle"
-    export NO_WINE=true
-    "$root_dir/tools/fix-core.sh"
-    "$root_dir/tools/fix-other.sh"
-  fi
+# 构建压缩包
+notice "BUILD Simple Package"
+"$root_dir/tools/build-tar.sh"
 
-  # 构建压缩包
-  notice "BUILD Simple Package"
-  "$root_dir/tools/build-tar.sh"
-
-  # 构建AppImage
-  notice "BUILD AppImage"
-  "$root_dir/tools/build-appimage.sh"
-
-done
+# 构建AppImage
+notice "BUILD AppImage"
+"$root_dir/tools/build-appimage.sh"

tools/fix-other.sh

@@ -14,29 +14,18 @@ sed -i 's#module.exports = createWebviewManager;#module.exports = createWebviewM
 
 # 修复：可视化用的wcc,wcsc
 echo "fix: wcc,wcsc"
-if [[ ! -d "$tmp_dir/node_modules" ]];then
-  mkdir -p "$tmp_dir/node_modules"
-fi
-cd $tmp_dir && npm install miniprogram-compiler
 # wcc wcsc
 # 可视化编译
 (cd "${package_dir}/node_modules/" \
-&& rm -rf wcc wcsc \
-&& mkdir -p "wcc/bin/linux" \
-&& cp -r "${tmp_dir}/node_modules/miniprogram-compiler/bin/linux/wcc" "wcc/bin/linux/wcc" \
-&& cp -r "${tmp_dir}/node_modules/miniprogram-compiler/bin/linux/wcsc" "wcc/bin/linux/wcsc" \
-&& chmod 0755 "wcc/bin/linux/wcc" "wcc/bin/linux/wcsc" \
-&& cp -r "${srcdir}/compiler/wcc_node"/* "wcc" 
+&& rm -rf wcc \
+&& cp -rL "${srcdir}/compiler/wcc_node" "wcc" 
 )
 
 # 预览编译，设置NO_WINE=true环境变量生效
 # 如果是mac执行wcc,否则wcc.exe
 if [[ $NO_WINE == 'true' ]];then
   \cp -rf "${srcdir}/compiler/generatemd5.js" "${package_dir}/js/vendor/generatemd5.js"
-  \cp -rf "${srcdir}/compiler/nodejs/wcc" "${package_dir}/js/vendor/wcc"
-  \cp -rf "${srcdir}/compiler/nodejs/wcsc" "${package_dir}/js/vendor/wcsc"
-  \cp -rf "${tmp_dir}/node_modules/miniprogram-compiler/bin/linux/wcc" "${package_dir}/js/vendor/wcc.bin"
-  \cp -rf "${tmp_dir}/node_modules/miniprogram-compiler/bin/linux/wcsc" "${package_dir}/js/vendor/wcsc.bin"
+  \cp "${srcdir}/compiler/nodejs"/* "${package_dir}/js/vendor"
   cd "${package_dir}/js/vendor" && chmod 0755 wcc wcsc wcc.bin wcsc.bin
   node "${package_dir}/js/vendor/generatemd5.js"