From 53af21c5677139d837a70cbd7f8a07fccc2ef9fa Mon Sep 17 00:00:00 2001 From: Krishan <33421343+kfiven@users.noreply.github.com> Date: Tue, 31 Oct 2023 22:12:31 +1100 Subject: [PATCH 1/2] Update tauri.yml --- .github/workflows/tauri.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tauri.yml b/.github/workflows/tauri.yml index c2a195b..52adb6f 100644 --- a/.github/workflows/tauri.yml +++ b/.github/workflows/tauri.yml @@ -31,7 +31,7 @@ jobs: - name: Install tauri dependencies run: npm ci - name: Build desktop app with Tauri - uses: tauri-apps/tauri-action@v0.3.1 + uses: tauri-apps/tauri-action@v0.4.4 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} @@ -90,13 +90,13 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf + sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf - name: Install cinny dependencies run: cd cinny && npm ci - name: Install tauri dependencies run: npm ci - name: Build desktop app with Tauri - uses: tauri-apps/tauri-action@v0.3.1 + uses: tauri-apps/tauri-action@v0.4.4 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} @@ -151,7 +151,7 @@ jobs: - name: Install tauri dependencies run: npm ci - name: Build desktop app with Tauri - uses: tauri-apps/tauri-action@v0.3.1 + uses: tauri-apps/tauri-action@v0.4.4 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} @@ -205,7 +205,7 @@ jobs: # - name: Install rustup target aarch64 darwin # run: rustup target add aarch64-apple-darwin # - name: Build desktop app with Tauri - # uses: tauri-apps/tauri-action@v0.3.1 + # uses: tauri-apps/tauri-action@v0.4.4 # env: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} From 97a037d35f5249f720a91d38a24de80f64415892 Mon Sep 17 00:00:00 2001 From: Krishan <33421343+kfiven@users.noreply.github.com> Date: Tue, 31 Oct 2023 22:39:37 +1100 Subject: [PATCH 2/2] Update tauri.yml --- .github/workflows/tauri.yml | 118 ++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/.github/workflows/tauri.yml b/.github/workflows/tauri.yml index 52adb6f..ce1031d 100644 --- a/.github/workflows/tauri.yml +++ b/.github/workflows/tauri.yml @@ -177,69 +177,69 @@ jobs: src-tauri/target/release/bundle/macos/Cinny_desktop-x86_64.app.tar.gz.sig # macos-aarch64 - # macos-aarch64: - # runs-on: macos-12 - # steps: - # - name: Checkout repository - # uses: actions/checkout@v3.5.3 - # with: - # submodules: true - # - name: Get release - # id: get_release - # uses: bruceadams/get-release@74c3d60f5a28f358ccf241a00c9021ea16f0569f - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # - name: Setup node - # uses: actions/setup-node@v3.4.1 - # with: - # node-version: 18.12.1 - # cache: 'npm' - # - name: Install Rust stable - # uses: actions-rs/toolchain@v1.0.7 - # with: - # toolchain: stable - # - name: Install cinny dependencies - # run: cd cinny && npm ci - # - name: Install tauri dependencies - # run: npm ci - # - name: Install rustup target aarch64 darwin - # run: rustup target add aarch64-apple-darwin - # - name: Build desktop app with Tauri - # uses: tauri-apps/tauri-action@v0.4.4 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} - # TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} - # NODE_OPTIONS: "--max_old_space_size=4096" - # with: - # args: --target aarch64-apple-darwin - # releaseId: ${{ steps.get_release.outputs.upload_url }} - # - name: Get app version - # if: always() - # id: vars - # run: echo ::set-output name=tag::$(jq .package.version src-tauri/tauri.conf.json | tr -d '"') - # - name: Move dmg - # if: always() - # run: mv "src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/Cinny_${{ steps.vars.outputs.tag }}_aarch64.dmg" "src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/Cinny_desktop-aarch64.dmg" - # - name: Move app.tar.gz - # if: always() - # run: mv "src-tauri/target/aarch64-apple-darwin/release/bundle/macos/Cinny.app.tar.gz" "src-tauri/target/aarch64-apple-darwin/release/bundle/macos/Cinny_desktop-aarch64.app.tar.gz" - # - name: Move app.tar.gz.sig - # if: always() - # run: mv "src-tauri/target/aarch64-apple-darwin/release/bundle/macos/Cinny.app.tar.gz.sig" "src-tauri/target/aarch64-apple-darwin/release/bundle/macos/Cinny_desktop-aarch64.app.tar.gz.sig" - # - name: Upload tagged release - # if: always() - # uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 - # with: - # files: | - # src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/Cinny_desktop-aarch64.dmg - # src-tauri/target/aarch64-apple-darwin/release/bundle/macos/Cinny_desktop-aarch64.tar.gz - # src-tauri/target/aarch64-apple-darwin/release/bundle/macos/Cinny_desktop-aarch64.tar.gz.sig + macos-aarch64: + runs-on: macos-13-arm64 + steps: + - name: Checkout repository + uses: actions/checkout@v3.5.3 + with: + submodules: true + - name: Get release + id: get_release + uses: bruceadams/get-release@74c3d60f5a28f358ccf241a00c9021ea16f0569f + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Setup node + uses: actions/setup-node@v3.4.1 + with: + node-version: 18.12.1 + cache: 'npm' + - name: Install Rust stable + uses: actions-rs/toolchain@v1.0.7 + with: + toolchain: stable + - name: Install cinny dependencies + run: cd cinny && npm ci + - name: Install tauri dependencies + run: npm ci + - name: Install rustup target aarch64 darwin + run: rustup target add aarch64-apple-darwin + - name: Build desktop app with Tauri + uses: tauri-apps/tauri-action@v0.4.4 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} + TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} + NODE_OPTIONS: "--max_old_space_size=4096" + with: + args: --target aarch64-apple-darwin + releaseId: ${{ steps.get_release.outputs.upload_url }} + - name: Get app version + if: always() + id: vars + run: echo ::set-output name=tag::$(jq .package.version src-tauri/tauri.conf.json | tr -d '"') + - name: Move dmg + if: always() + run: mv "src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/Cinny_${{ steps.vars.outputs.tag }}_aarch64.dmg" "src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/Cinny_desktop-aarch64.dmg" + - name: Move app.tar.gz + if: always() + run: mv "src-tauri/target/aarch64-apple-darwin/release/bundle/macos/Cinny.app.tar.gz" "src-tauri/target/aarch64-apple-darwin/release/bundle/macos/Cinny_desktop-aarch64.app.tar.gz" + - name: Move app.tar.gz.sig + if: always() + run: mv "src-tauri/target/aarch64-apple-darwin/release/bundle/macos/Cinny.app.tar.gz.sig" "src-tauri/target/aarch64-apple-darwin/release/bundle/macos/Cinny_desktop-aarch64.app.tar.gz.sig" + - name: Upload tagged release + if: always() + uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 + with: + files: | + src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/Cinny_desktop-aarch64.dmg + src-tauri/target/aarch64-apple-darwin/release/bundle/macos/Cinny_desktop-aarch64.tar.gz + src-tauri/target/aarch64-apple-darwin/release/bundle/macos/Cinny_desktop-aarch64.tar.gz.sig # Upload release.json release-update: if: always() - needs: [windows-x86_64, linux-x86_64, macos-x86_64] #, macos-aarch64] + needs: [windows-x86_64, linux-x86_64, macos-x86_64, macos-aarch64] runs-on: ubuntu-latest steps: - name: Checkout repository