diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6dd27f8..4b0a8f3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -95,6 +95,13 @@ jobs: name: wechat-devtools-${{ matrix.ARCH }}.src path: tmp/src + - name: Upload artifact + uses: actions/upload-artifact@v2.3.1 + with: + # Artifact name + name: wechat-devtools-${{ matrix.ARCH }}.build + path: tmp/build + build-tar: name: Build tar.gz AppImage needs: @@ -350,7 +357,7 @@ jobs: run: | wget -q https://github.com/TheAssassin/pyuploadtool/releases/download/continuous/pyuploadtool-x86_64.AppImage chmod +x pyuploadtool-x86_64.AppImage - ./pyuploadtool-x86_64.AppImage **/WeChat*.AppImage **/*.tar.gz **/*.deb **/*.pkg.* + ./pyuploadtool-x86_64.AppImage **build/WeChat*.AppImage **build/*.tar.gz **build/*.deb **build/*.pkg.* - name: Release uses: softprops/action-gh-release@v1 @@ -361,7 +368,7 @@ jobs: name: ${{ steps.tag.outputs.name }} tag_name: ${{ steps.tag.outputs.tag }} files: | - **/WeChat*.AppImage - **/*.tar.gz - **/*.deb - **/*.pkg.* \ No newline at end of file + **build/WeChat*.AppImage + **build/*.tar.gz + **build/*.deb + **build/*.pkg.* \ No newline at end of file diff --git a/res/aur/PKGBUILD b/res/aur/PKGBUILD index cde1ce9..0c18a37 100644 --- a/res/aur/PKGBUILD +++ b/res/aur/PKGBUILD @@ -32,7 +32,7 @@ makedepends=('p7zip' 'python2' 'openssl' 'gcc' 'make' 'libssh2' 'krb5') source=("nwjs-v${_nwjs_ver}.tar.gz::https://npm.taobao.org/mirrors/nwjs/v${_nwjs_ver}/nwjs-sdk-v${_nwjs_ver}-linux-x64.tar.gz" "${_wechat_devtools_exe}::${_wechat_devtools_url}" "node-v${_node_version}.tar.gz::https://npm.taobao.org/mirrors/node/v${_node_version}/node-v${_node_version}-linux-x64.tar.gz" - "compiler.tar.gz::https://download.fastgit.org/msojocs/wechat-devtools-linux/releases/download/v1.05.2203070-2/compiler.tar.gz" + "compiler.tar.gz::https://github.rc1844.workers.dev/msojocs/wechat-devtools-linux/releases/download/v1.05.2203070-2/compiler.tar.gz" "wechat-devtools.desktop" "logo.svg" "fix-cli.sh" diff --git a/tools/build-aur.sh b/tools/build-aur.sh index b542c6e..fb3c738 100755 --- a/tools/build-aur.sh +++ b/tools/build-aur.sh @@ -59,7 +59,7 @@ cp "$root_dir/tools"/*.sh "$build_dir" cp "$root_dir/tools"/*.js "$build_dir" cp "$root_dir/res/aur"/* "$build_dir" cp "$tmp_dir/compiler.tar.gz" "$build_dir" # 复制编译器 -sed -i 's/download.fastgit.org/github.com/' "$build_dir/PKGBUILD" # 修改下载服务器 +# sed -i 's/download.fastgit.org/github.com/' "$build_dir/PKGBUILD" # 修改下载服务器 sed -i "s/pkgrel=[0-9]\+/pkgrel=${pkgrel}/" "$build_dir/PKGBUILD" # 修改版本号 sed -i "s/[0-9a-z]\+ # compiler/${COMPILER_MD5} # compiler/" "$build_dir/PKGBUILD" # 修改编译器MD5 sed -i "s/_wechat_devtools_ver=\"[0-9]\+\.[0-9]\+\.[0-9]\+\"/_wechat_devtools_ver=\"${TARGET_VERSION}\"/" "$build_dir/PKGBUILD"