diff --git a/.github/workflows/buildBS-win32.yml b/.github/workflows/buildBS-win32.yml index 51ef49e0b..ea004cce7 100644 --- 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 index 149d5c904..4b61483c7 100644 --- 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 deleted file mode 100644 index e4374885c..000000000 --- a/build/clearup-develop-files.bat +++ /dev/null @@ -1,7 +0,0 @@ -Del /S /Q /F curl.exe -Del /S /Q /F util -Del /S /Q /F lib -Del /S /Q /F .github -Del /S /Q /F .\src\web -Del /S /Q /F .\public\sass -Del /S /Q /F .\test