Skip to content

Commit

Permalink
Change pkg to an update-to-date fork & Fix dependency issues in relea…
Browse files Browse the repository at this point in the history
…se maker

Signed-off-by: yjf2002ghty <[email protected]>
  • Loading branch information
yjf2002ghty committed Dec 13, 2024
1 parent b30d334 commit bdd0fec
Show file tree
Hide file tree
Showing 5 changed files with 297 additions and 117 deletions.
5 changes: 3 additions & 2 deletions release_make/CI.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function Error() {
exit 1
}

export nodeversion="node18"
export nodeversion="node20"

echo ""
echo "[Info] Continuous integration platform specification:"
Expand Down Expand Up @@ -63,7 +63,7 @@ mkdir -p ./release-builds/script/any

npm install || Error
cp -r ./node_modules ./node_modules_script
npm install pkg || Error
npm install @yao-pkg/[email protected] || Error

function TryNoByteCode() {
npx pkg . --no-bytecode --public --public-packages --target $1 --output $2 >/tmp/make_fairyground.log 2>&1
Expand Down Expand Up @@ -126,6 +126,7 @@ npm run build || Error

rm -f ./public/vercel.json
rm -f ./public/serve.json
rm -f ./public/_headers
find ./public -type f -name "original.*" -exec rm -f {} \;

cp -r ./public ./release_make/release-builds/win/x64/
Expand Down
4 changes: 2 additions & 2 deletions release_make/make.bat
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@echo off
SETLOCAL ENABLEEXTENSIONS
SETLOCAL ENABLEDELAYEDEXPANSION
set nodeversion=node18
set nodeversion=node20
cd /d "%~dp0"
rd /s /q .\release-builds
md .\release-builds || goto Error
Expand Down Expand Up @@ -39,7 +39,7 @@ set PATH=%PATH%;%~dp0ldid\win\%arch%

::Platforms include x86, x64, arm, arm64
set result=
start /wait "" cmd.exe /C npm install pkg ^> %TEMP%\make_fairyground.log ^& exit
start /wait "" cmd.exe /C npm install @yao-pkg/pkg@5.16.1 ^> %TEMP%\make_fairyground.log ^& exit
FOR /F "usebackq" %%i IN (`findstr /L /I "Error" "%TEMP%\make_fairyground.log"`) DO set result=%%i
if not "%result%"=="" (goto Error)

Expand Down
4 changes: 2 additions & 2 deletions release_make/make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function Error() {
exit 1
}

export nodeversion="node18"
export nodeversion="node20"

if [ -d "./node_modules" ]; then
echo
Expand Down Expand Up @@ -43,7 +43,7 @@ mkdir -p ./release-builds/macos/x64
mkdir -p ./release-builds/macos/arm64
mkdir -p ./release-builds/script/any

npm install pkg || Error
npm install @yao-pkg/[email protected] || Error

function TryNoByteCode() {
npx pkg . --no-bytecode --public --public-packages --target $1 --output $2 >/tmp/make_fairyground.log 2>&1
Expand Down
4 changes: 2 additions & 2 deletions release_make/make_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function Error() {
exit 1
}

export nodeversion="node18"
export nodeversion="node20"

if [ -d "./node_modules" ]; then
echo
Expand Down Expand Up @@ -43,7 +43,7 @@ mkdir -p ./release-builds/macos/x64
mkdir -p ./release-builds/macos/arm64
mkdir -p ./release-builds/script/any

npm install pkg || Error
npm install @yao-pkg/[email protected] || Error

function TryNoByteCode() {
npx pkg . --no-bytecode --public --public-packages --target $1 --output $2 >/tmp/make_fairyground.log 2>&1
Expand Down
Loading

0 comments on commit bdd0fec

Please sign in to comment.