fix: workflows

This commit is contained in:
msojocs 2022-08-29 20:54:52 +08:00
parent 9b4935ac10
commit 3f20e31df1
4 changed files with 6 additions and 15 deletions

View File

@ -57,7 +57,7 @@ jobs:
export DOCKER_UID=$UID export DOCKER_UID=$UID
export DOCKER_GID=$GID export DOCKER_GID=$GID
ls -l ls -l
export WINE=true export WINE=false
docker-compose up docker-compose up
- name: Compress Resources - name: Compress Resources
@ -68,11 +68,7 @@ jobs:
cp node/bin/node nwjs/node cp node/bin/node nwjs/node
cd nwjs && ln -s node node.exe cd nwjs && ln -s node node.exe
cd .. cd ..
tar -zcf tmp/src/src-wine.tar.gz bin nwjs package.nw tools tar -zcf tmp/src/src-linux.tar.gz bin nwjs package.nw tools
export WINE=false
"tools/fix-core.sh"
"tools/fix-other.sh"
tar -zcf tmp/src/src-no-wine.tar.gz bin nwjs package.nw tools
- name: Compress nodegit compiler - name: Compress nodegit compiler
run: | run: |
@ -142,16 +138,13 @@ jobs:
- name: Build - name: Build
run: | run: |
export WINE=true export WINE=false
export ACTION_MODE=true export ACTION_MODE=true
# tar.gz AppImage # tar.gz AppImage
ls -l ls -l
mkdir -p tmp/build mkdir -p tmp/build
tools/build-prepare.sh tools/build-prepare.sh
tools/build-release.sh ${{ matrix.ARCH }} ${{ steps.tag.outputs.tag }} tools/build-release.sh ${{ matrix.ARCH }} ${{ steps.tag.outputs.tag }}
export WINE=false
tools/build-prepare.sh
tools/build-release.sh ${{ matrix.ARCH }} ${{ steps.tag.outputs.tag }}
- name: View Directory - name: View Directory
run: | run: |
@ -208,8 +201,6 @@ jobs:
export BUILD_VERSION=${{ steps.tag.outputs.tag }} export BUILD_VERSION=${{ steps.tag.outputs.tag }}
ls -l ls -l
mkdir -p tmp/build mkdir -p tmp/build
tools/build-prepare.sh
env WINE=true tools/build-deepin.sh ${{ steps.tag.outputs.tag }}
export WINE=false export WINE=false
tools/build-prepare.sh tools/build-prepare.sh
env WINE=false tools/build-deepin.sh ${{ steps.tag.outputs.tag }} env WINE=false tools/build-deepin.sh ${{ steps.tag.outputs.tag }}

@ -1 +1 @@
Subproject commit 83645b241c8119abc5e06b87cebfeaa78fe61893 Subproject commit 6bfcc7c0d395becd928092f0b7e609a33d8552b2

View File

@ -33,7 +33,7 @@ fi
package_name="io.github.msojocs.wechat-devtools" package_name="io.github.msojocs.wechat-devtools"
if [[ "$WINE" != 'true' ]];then if [[ "$WINE" != 'true' ]];then
BUILD_MARK='no_wine' BUILD_MARK='no_wine'
package_name="${package_name}-no-wine" package_name="${package_name}-linux"
else else
BUILD_MARK='wine' BUILD_MARK='wine'
NAME_SUFFIX=" (wine)" NAME_SUFFIX=" (wine)"

View File

@ -21,7 +21,7 @@ store_dir="$tmp_dir/build"
mkdir -p $store_dir mkdir -p $store_dir
rm -rf nwjs package.nw rm -rf nwjs package.nw
if [[ "$WINE" != 'true' ]];then if [[ "$WINE" != 'true' ]];then
tar -zxf wechat-devtools-*.src/src-no-wine.tar.gz -C . tar -zxf wechat-devtools-*.src/src-linux.tar.gz -C .
else else
tar -zxf wechat-devtools-*.src/src-wine.tar.gz -C . tar -zxf wechat-devtools-*.src/src-wine.tar.gz -C .
fi fi