Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change windows build shell #302

Merged
merged 2 commits into from
Apr 15, 2024
Merged

Change windows build shell #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6b6024
Change windows build shell to bash
dkdkwizard Apr 15, 2024
2f62ed0
Remove unused file
dkdkwizard Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 9 additions & 16 deletions .github/workflows/buildBS-win32.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
24 changes: 8 additions & 16 deletions .github/workflows/buildBS-win64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
7 changes: 0 additions & 7 deletions build/clearup-develop-files.bat
View file
Open in desktop

This file was deleted.

Loading