diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 90f5917..baa2304 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ on: push: tags: - v* - branches: [ master, build] + branches: [ master, dev] pull_request: branches: [ master ] # # Allows you to run this workflow manually from the Actions tab @@ -237,10 +237,10 @@ jobs: ls -l mkdir -p tmp/build tools/build-prepare.sh - sudo env NO_WINE=false tools/build-deepin.sh ${{ steps.tag.outputs.tag }} + env NO_WINE=false tools/build-deepin.sh ${{ steps.tag.outputs.tag }} export NO_WINE=true tools/build-prepare.sh - sudo env NO_WINE=true tools/build-deepin.sh ${{ steps.tag.outputs.tag }} + env NO_WINE=true tools/build-deepin.sh ${{ steps.tag.outputs.tag }} - name: Upload artifact uses: actions/upload-artifact@v2.3.1 diff --git a/res/deepin/debian/changelog b/res/deepin/debian/changelog index 1f0725b..2b1230f 100644 --- a/res/deepin/debian/changelog +++ b/res/deepin/debian/changelog @@ -1,4 +1,4 @@ -io.github.msojocs.wechat-devtools-no-wine (1.05.2203070-7) unstable; urgency=medium +io.github.msojocs.wechat-devtools (1.05.2203070-7) unstable; urgency=medium * fix: - cli diff --git a/tools/build-deepin.sh b/tools/build-deepin.sh index 94d203c..8194912 100755 --- a/tools/build-deepin.sh +++ b/tools/build-deepin.sh @@ -58,7 +58,7 @@ cp -r "$root_dir/res/deepin"/* $build_dir mv "$build_dir/opt/apps/io.github.msojocs.wechat-devtools"/* $base_dir rm -r "$build_dir/opt/apps/io.github.msojocs.wechat-devtools" sed -i "s/BUILD_VERSION/${BUILD_VERSION//v/}/" "$build_dir/debian/control" "$base_dir/info" -sed -i "s/io.github.msojocs.wechat-devtools/$package_name/g" "$base_dir/info" "$build_dir/debian/control" +sed -i "s/io.github.msojocs.wechat-devtools/$package_name/g" "$base_dir/info" "$build_dir/debian/control" "$build_dir/debian/changelog" \cp -rf "$root_dir/bin/wechat-devtools" "$base_dir/files/bin/bin/wechat-devtools" # desktop @@ -90,11 +90,10 @@ cd "$build_dir" ls -l "$build_dir" mkdir -p "$root_dir/tmp/build" -if [[ ! $NO_WINE -eq 'true' ]];then +if [[ $NO_WINE != 'true' ]];then + echo "添加wine依赖 - $NO_WINE" echo "Depends: wine, wine-binfmt" >> "$build_dir/debian/control" fi -# cd "$tmp_dir" -# tar -zcf "$tmp_dir/${package_name}_${BUILD_VERSION//v/}.orig.tar.gz" "$package_name" -# dpkg-deb -b . "$root_dir/tmp/build/WeChat_Dev_Tools_${BUILD_VERSION}_amd64_${BUILD_MARK}_deepin.deb" -echo 'y' | debuild \ No newline at end of file +echo 'y' | debuild +mv $tmp_dir/*.deb $tmp_dir/build \ No newline at end of file