diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2dd3f35..1ceeef7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -151,6 +151,8 @@ jobs: # ./test/wine/wcc.exe pnpm run test-prepare sudo apt install -y xvfb + ls -l build + ls -l test/runner/nwjs/wcc/build/Release # pnpm run test - uses: ./.github/actions/test with: diff --git a/.gitignore b/.gitignore index 97c8451..c09562b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -build +/build cache test/*.json wcc.exe.c diff --git a/test/node-gyp/.gitignore b/test/node-gyp/.gitignore new file mode 100644 index 0000000..c795b05 --- /dev/null +++ b/test/node-gyp/.gitignore @@ -0,0 +1 @@ +build \ No newline at end of file diff --git a/test/runner/nwjs/module-prepare.sh b/test/runner/nwjs/module-prepare.sh index ef605bb..d374c32 100755 --- a/test/runner/nwjs/module-prepare.sh +++ b/test/runner/nwjs/module-prepare.sh @@ -30,33 +30,54 @@ fi rm -rf "$root_dir/cache/nwjs-sdk-v$nw_version-win-x64/package.nw" cp -r "$cur_dir/package.nw" "$root_dir/cache/nwjs-sdk-v$nw_version-win-x64" -docker run -d -i\ - --volume=$root_dir:/workspace\ - --env=USE_XVFB=yes\ - --env=XVFB_SERVER=:95\ - --env=XVFB_SCREEN=0\ - --env=XVFB_RESOLUTION=320x240x8\ - --env=DISPLAY=:95\ - --hostname=DESKTOP-1TV4OA1\ - --name=wine\ - --shm-size=1g\ - --workdir=/home/wineuser\ - --env=TZ=Asia/Shanghai\ - --volume=winehome:/home/wineuser\ - -p 8083:8083\ - scottyhardy/docker-wine:latest\ - wine /workspace/cache/nwjs-sdk-v$nw_version-win-x64/nw.exe -i=0 -until $(curl --output /dev/null --silent --head --fail http://127.0.0.1:8083/check); do - printf '.' - curl http://127.0.0.1:8083/check - sleep 1 - let i=$i+1 - if [ $i -ge 50 ];then - echo "error" +docker_start(){ + docker run -d -i\ + --rm\ + --volume=$root_dir:/workspace\ + --env=USE_XVFB=yes\ + --env=XVFB_SERVER=:95\ + --env=XVFB_SCREEN=0\ + --env=XVFB_RESOLUTION=320x240x8\ + --env=DISPLAY=:95\ + --hostname=DESKTOP-1TV4OA1\ + --name=wine\ + --shm-size=1g\ + --workdir=/home/wineuser\ + --env=TZ=Asia/Shanghai\ + --volume=winehome:/home/wineuser\ + -p 8083:8083\ + scottyhardy/docker-wine:latest\ + wine /workspace/cache/nwjs-sdk-v$nw_version-win-x64/nw.exe + + i=0 + until $(curl --output /dev/null --silent --head --fail http://127.0.0.1:8083/check); do + printf '.' + curl http://127.0.0.1:8083/check + sleep 1 + let i=$i+1 + if [ $i -ge 50 ];then + echo "error" + docker ps -a + docker logs wine + return 1 + fi + done + return 0 +} + +for ((i=0; i<5; i++)); +do + ret=$(docker_start) + if [ "$ret" -eq 0 ];then + echo "Docker started successfully." + break + fi + if [ "$i" -eq 4 ];then + echo "Failed to start Docker after 5 attempts." docker ps -a docker logs wine exit 1 fi + sleep 1 done echo "success" \ No newline at end of file diff --git a/test/runner/nwjs/package.nw/wcc/build/Release/wcc.node b/test/runner/nwjs/package.nw/wcc/build/Release/wcc.node new file mode 100644 index 0000000..88ec06b Binary files /dev/null and b/test/runner/nwjs/package.nw/wcc/build/Release/wcc.node differ diff --git a/test/runner/nwjs/package.nw/wcc/build/Release/wcsc.node b/test/runner/nwjs/package.nw/wcc/build/Release/wcsc.node new file mode 100644 index 0000000..edce6e6 Binary files /dev/null and b/test/runner/nwjs/package.nw/wcc/build/Release/wcsc.node differ diff --git a/test/runner/nwjs/wcc/build/Release/wcc.node b/test/runner/nwjs/wcc/build/Release/wcc.node new file mode 120000 index 0000000..d662e03 --- /dev/null +++ b/test/runner/nwjs/wcc/build/Release/wcc.node @@ -0,0 +1 @@ +../../../../../../build/wcc_module.node \ No newline at end of file diff --git a/test/runner/nwjs/wcc/build/Release/wcsc.node b/test/runner/nwjs/wcc/build/Release/wcsc.node new file mode 120000 index 0000000..873c8a2 --- /dev/null +++ b/test/runner/nwjs/wcc/build/Release/wcsc.node @@ -0,0 +1 @@ +../../../../../../build/wcsc_module.node \ No newline at end of file