From 3f20e31df17fb60a49e58f17ad0d52b035605407 Mon Sep 17 00:00:00 2001 From: msojocs Date: Mon, 29 Aug 2022 20:54:52 +0800 Subject: [PATCH] fix: workflows --- .github/workflows/release.yml | 15 +++------------ compiler | 2 +- tools/build-deepin.sh | 2 +- tools/build-prepare.sh | 2 +- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cc7f6ce..8ccd010 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -57,7 +57,7 @@ jobs: export DOCKER_UID=$UID export DOCKER_GID=$GID ls -l - export WINE=true + export WINE=false docker-compose up - name: Compress Resources @@ -68,11 +68,7 @@ jobs: cp node/bin/node nwjs/node cd nwjs && ln -s node node.exe cd .. - tar -zcf tmp/src/src-wine.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 + tar -zcf tmp/src/src-linux.tar.gz bin nwjs package.nw tools - name: Compress nodegit compiler run: | @@ -142,16 +138,13 @@ jobs: - name: Build run: | - export WINE=true + export WINE=false export ACTION_MODE=true # tar.gz AppImage ls -l mkdir -p tmp/build tools/build-prepare.sh 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 run: | @@ -208,8 +201,6 @@ jobs: export BUILD_VERSION=${{ steps.tag.outputs.tag }} ls -l mkdir -p tmp/build - tools/build-prepare.sh - env WINE=true tools/build-deepin.sh ${{ steps.tag.outputs.tag }} export WINE=false tools/build-prepare.sh env WINE=false tools/build-deepin.sh ${{ steps.tag.outputs.tag }} diff --git a/compiler b/compiler index 83645b2..6bfcc7c 160000 --- a/compiler +++ b/compiler @@ -1 +1 @@ -Subproject commit 83645b241c8119abc5e06b87cebfeaa78fe61893 +Subproject commit 6bfcc7c0d395becd928092f0b7e609a33d8552b2 diff --git a/tools/build-deepin.sh b/tools/build-deepin.sh index d00fe0b..2fb325b 100755 --- a/tools/build-deepin.sh +++ b/tools/build-deepin.sh @@ -33,7 +33,7 @@ fi package_name="io.github.msojocs.wechat-devtools" if [[ "$WINE" != 'true' ]];then BUILD_MARK='no_wine' - package_name="${package_name}-no-wine" + package_name="${package_name}-linux" else BUILD_MARK='wine' NAME_SUFFIX=" (wine)" diff --git a/tools/build-prepare.sh b/tools/build-prepare.sh index eb7fde2..0bf74d9 100755 --- a/tools/build-prepare.sh +++ b/tools/build-prepare.sh @@ -21,7 +21,7 @@ store_dir="$tmp_dir/build" mkdir -p $store_dir rm -rf nwjs package.nw 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 tar -zxf wechat-devtools-*.src/src-wine.tar.gz -C . fi \ No newline at end of file