Change windows build shell (#302)

* Change windows build shell to bash * Remove unused file
flux3dp · Apr 15, 2024 · 43c2418 · 43c2418
1 parent 72af05d
commit 43c2418
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 39 deletions.
diff --git a/.github/workflows/buildBS-win32.yml b/.github/workflows/buildBS-win32.yml
@@ -88,32 +88,25 @@ jobs:
           cp -R .github/actions/beam-studio-core/public/js/lib ./public/js/
 
       - name: Build Beam Studio
+        shell: bash
         run: |
           mkdir backend
-
           yarn install --network-timeout 100000
           ./node_modules/.bin/webpack
 
-          $env:TMP
-          cp -R $env:TMP/flux_api_swap backend/flux_api
+          cp -R $TMP/flux_api_swap backend/flux_api
           cp -R lib/elevate.cmd backend/elevate.cmd
           cp -R lib/elevate.vbs backend/elevate.vbs
           ./backend/flux_api/flux_api --test --without_pcl
 
           cp -R util/win32 utils
-          cp -Force ./ihatewindowsCodeSign.js ./node_modules/app-builder-lib/out/codeSign/windowsCodeSign.js
-
-          ./build/clearup-develop-files
-
-          if (${{ matrix.arch }} -eq 64) {
-            echo 64
-            yarn dist --win --x64 --publish always
-          }
-          else {
-            echo 32
-            $env:PUBLISH_PATH = "-x86"
-            yarn dist --win --ia32 --publish always
-          }
+          cp ./ihatewindowsCodeSign.js ./node_modules/app-builder-lib/out/codeSign/windowsCodeSign.js
+
+          bash ./build/clearup-develop-files.sh
+
+          echo 32
+          export PUBLISH_PATH="-x86"
+          yarn dist --win --ia32 --publish always
         env:
           PUBLISH_BUCKET: beamstudio
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

diff --git a/.github/workflows/buildBS-win64.yml b/.github/workflows/buildBS-win64.yml
@@ -87,33 +87,25 @@ jobs:
           cp -R .github/actions/beam-studio-core/public/js/lib ./public/js/
 
       - name: Build Beam Studio
+        shell: bash
         run: |
           mkdir backend
-
           yarn install --network-timeout 100000
           ./node_modules/.bin/webpack
 
-          $env:TMP
-          cp -R $env:TMP/flux_api_swap backend/flux_api
+          cp -R $TMP/flux_api_swap backend/flux_api
           cp -R lib/monitorexe-win64 backend/monitorexe-win64
           cp -R lib/elevate.cmd backend/elevate.cmd
           cp -R lib/elevate.vbs backend/elevate.vbs
           ./backend/flux_api/flux_api --test --without_pcl
 
           cp -R util/win64 utils
-          cp -Force ./ihatewindowsCodeSign.js ./node_modules/app-builder-lib/out/codeSign/windowsCodeSign.js
-
-          ./build/clearup-develop-files
-
-          if (${{ matrix.arch }} -eq 64) {
-            echo 64
-            yarn dist --win --x64 --publish always
-          }
-          else {
-            echo 32
-            $env:PUBLISH_PATH = "-x86"
-            yarn dist --win --ia32 --publish always
-          }
+          cp ./ihatewindowsCodeSign.js ./node_modules/app-builder-lib/out/codeSign/windowsCodeSign.js
+
+          bash ./build/clearup-develop-files.sh
+
+          echo 64
+          yarn dist --win --x64 --publish always
         env:
           PUBLISH_BUCKET: beamstudio
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

diff --git a/build/clearup-develop-files.bat b/build/clearup-develop-files.bat