diff --git a/.github/workflows/pake_build_with_cache.yaml b/.github/workflows/pake_build_with_cache.yaml index 23fd304..c7c72de 100644 --- a/.github/workflows/pake_build_with_cache.yaml +++ b/.github/workflows/pake_build_with_cache.yaml @@ -99,14 +99,43 @@ jobs: src-tauri/target/ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - # - name: Build archive - # shell: bash - # run: | - # cd src-tauri - # tar -czf "${{ matrix.archive-name }}" target - - # - name: Upload archive - # uses: actions/upload-artifact@v1 - # with: - # name: ${{ matrix.archive-name }} - # path: src-tauri/${{ matrix.archive-name }} + + # test build aarch64 + aarch64-linux: + runs-on: ubuntu-20.04 +# needs: build-dist-bundle + steps: + - uses: actions/checkout@v3 + + - uses: uraimo/run-on-arch-action@v2.3.0 + name: build native modules using another arch + with: + arch: aarch64 + distro: ubuntu20.04 + githubToken: ${{ github.token }} + dockerRunArgs: | + --volume "${PWD}:/build" + --volume "/home/runner:/home/runner" + install: | + apt-get update && apt-get install -y gnupg2 && apt-get install curl -y + curl -fsSL https://deb.nodesource.com/setup_18.x | bash - + apt-get install -y nodejs gcc g++ make + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + source "$HOME/.cargo/env" + apt-get install -y libwebkit2gtk-4.0-dev build-essential wget libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev gnome-video-effects gnome-video-effects-extra + corepack enable + run: | + uname -a + chmod -R 777 /build + npm install + source "$HOME/.cargo/env" + export RUST_BACKTRACE=1 + npm run build:all-unix + + - name: Upload files + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + UPLOADTOOL_ISPRERELEASE: true + run: | + curl -L https://github.com/probonopd/uploadtool/raw/master/upload.sh --output upload.sh + bash upload.sh output/*/*.* \ No newline at end of file diff --git a/app.csv b/app.csv index adc25c3..6527636 100644 --- a/app.csv +++ b/app.csv @@ -1,12 +1,2 @@ name(Linux),name(Mac/Windows),name_zh,url -twitter,Twitter,推特,https://twitter.com/ -youtube,YouTube,YouTube,https://youtube.com -reference,Reference,Reference,https://wangchujiang.com/reference/index.html -code,Code,Code,https://riju.codes/ -yuque,YuQue,语雀,https://www.yuque.com/ -chatgpt,ChatGPT,ChatGPT,https://chat.openai.com/chat -flomo,Flomo,浮墨,https://v.flomoapp.com/mine -qwerty,Qwerty,Qwerty,https://qwerty.kaiyi.cool/ -zlibrary,ZLibrary,ZLibrary,https://x.zeuslib.com -lizhi,LiZhi,李志,https://lizhi.turkyden.com/?from=pake weread,WeRead,微信阅读,https://weread.qq.com/ diff --git a/script/build.sh b/script/build.sh index efa91d5..9c506c8 100755 --- a/script/build.sh +++ b/script/build.sh @@ -40,7 +40,7 @@ if [[ "$OSTYPE" =~ ^linux ]]; then echo "===============" echo "Build for Linux" echo "===============" - export sd=${SHELL_FOLDER}/sd-linux-x64 + export sd=${SHELL_FOLDER}/sd-linux-`arch` chmod +x "$sd" # for linux, package name may be com.xxx.xxx echo "rename package name" @@ -120,8 +120,8 @@ do if [[ "$OSTYPE" =~ ^linux ]]; then npm run tauri build - mv src-tauri/target/release/bundle/deb/${package_prefix}-"${package_name}"*.deb output/linux/"${package_title}"_amd64.deb - mv src-tauri/target/release/bundle/appimage/${package_prefix}-"${package_name}"*.AppImage output/linux/"${package_title}"_amd64.AppImage + mv src-tauri/target/release/bundle/deb/${package_prefix}-"${package_name}"*.deb output/linux/"${package_title}"_`arch`.deb + mv src-tauri/target/release/bundle/appimage/${package_prefix}-"${package_name}"*.AppImage output/linux/"${package_title}"_`arch`.AppImage echo clear cache rm src-tauri/target/release rm -rf src-tauri/target/release/bundle diff --git a/script/sd-linux-aarch64 b/script/sd-linux-aarch64 new file mode 100755 index 0000000..7715608 Binary files /dev/null and b/script/sd-linux-aarch64 differ diff --git a/script/sd-linux-x64 b/script/sd-linux-x86_64 similarity index 100% rename from script/sd-linux-x64 rename to script/sd-linux-x86_64