From 8f64569062248aed0f2ea58eee05bea639b1961e Mon Sep 17 00:00:00 2001 From: zanllp Date: Mon, 2 Jun 2025 21:32:38 +0800 Subject: [PATCH 1/4] release --- vue/src-tauri/tauri.conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue/src-tauri/tauri.conf.json b/vue/src-tauri/tauri.conf.json index 75ef155..3f326a0 100644 --- a/vue/src-tauri/tauri.conf.json +++ b/vue/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "Infinite Image Browsing", - "version": "1.2.0" + "version": "1.3.0" }, "tauri": { "allowlist": { From 055471d54f35b5cee46662338509001e5f088556 Mon Sep 17 00:00:00 2001 From: zanllp Date: Mon, 2 Jun 2025 21:36:12 +0800 Subject: [PATCH 2/4] feat: update Actions runner --- .github/workflows/tauri_app_build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tauri_app_build.yml b/.github/workflows/tauri_app_build.yml index 1d2d934..570de86 100644 --- a/.github/workflows/tauri_app_build.yml +++ b/.github/workflows/tauri_app_build.yml @@ -9,7 +9,7 @@ jobs: build: strategy: matrix: - os: [windows-latest,ubuntu-20.04] + os: [windows-latest,ubuntu-22.04] runs-on: ${{ matrix.os }} @@ -20,7 +20,7 @@ jobs: uses: actions/checkout@v3 - run: echo "VERSION=$(jq -r '.package.version' vue/src-tauri/tauri.conf.json)" >> "$GITHUB_ENV" - if: matrix.os == 'ubuntu-20.04' + if: matrix.os == 'ubuntu-22.04' - run: echo "VERSION=$(jq -r '.package.version' vue/src-tauri/tauri.conf.json)" >> $env:GITHUB_ENV if: matrix.os == 'windows-latest' @@ -48,7 +48,7 @@ jobs: vue/dist=vue/dist - run: cp out/iib_api_server out/iib_app_cli-${{ env.VERSION }}-${{ runner.os }} - if: matrix.os == 'ubuntu-20.04' + if: matrix.os == 'ubuntu-22.04' - run: cp out/iib_api_server.exe out/iib_app_cli-${{ env.VERSION }}-${{ runner.os }}.exe if: matrix.os == 'windows-latest' @@ -72,7 +72,7 @@ jobs: if: matrix.os == 'windows-latest' - run: mv out/iib_api_server vue/src-tauri/iib_api_server-x86_64-unknown-linux-gnu - if: matrix.os == 'ubuntu-20.04' + if: matrix.os == 'ubuntu-22.04' - name: Install frontend dependencies run: yarn install @@ -92,7 +92,7 @@ jobs: workspaces: './vue/src-tauri -> target' - name: Install dependencies (ubuntu only) - if: matrix.os == 'ubuntu-20.04' + if: matrix.os == 'ubuntu-22.04' run: | sudo apt-get update sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf @@ -165,7 +165,7 @@ jobs: workspaces: './vue/src-tauri -> target' - name: Install dependencies (ubuntu only) - if: matrix.os == 'ubuntu-20.04' + if: matrix.os == 'ubuntu-22.04' run: | sudo apt-get update sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf From c100732a63745f6360615162cddca79b0cdcce52 Mon Sep 17 00:00:00 2001 From: zanllp Date: Tue, 3 Jun 2025 15:22:39 +0800 Subject: [PATCH 3/4] fix: fix workflow --- .github/workflows/tauri_app_build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tauri_app_build.yml b/.github/workflows/tauri_app_build.yml index 570de86..cf6eec4 100644 --- a/.github/workflows/tauri_app_build.yml +++ b/.github/workflows/tauri_app_build.yml @@ -53,7 +53,7 @@ jobs: if: matrix.os == 'windows-latest' - name: Upload Server Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: iib_app_cli_${{ runner.os }} path: | @@ -61,7 +61,7 @@ jobs: out/iib_app_cli-${{ env.VERSION }}-${{ runner.os }}.exe - name: Upload Server Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: iib_api_server-${{ env.VERSION }}-${{ runner.os }} path: | @@ -104,7 +104,7 @@ jobs: - name: Upload Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: bundle-${{ env.VERSION }}-${{ runner.os }} path: | @@ -180,7 +180,7 @@ jobs: mv "Infinite Image Browsing_${{ env.VERSION }}_x64-setup.exe" "Infinite Image Browsing_${{ env.VERSION }}_x64-setup-pyinstaller.exe" - name: Upload Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: bundle-${{ env.VERSION }}-${{ runner.os }} path: | @@ -202,22 +202,22 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: bundle-${{ env.VERSION }}-Windows path: artifacts - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: bundle-${{ env.VERSION }}-Linux path: artifacts - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: iib_app_cli_Windows path: artifacts - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: iib_app_cli_Linux path: artifacts From b4ba2f951b68e4b167c4d572a53e3b8880cf3ff3 Mon Sep 17 00:00:00 2001 From: zanllp Date: Tue, 3 Jun 2025 16:04:03 +0800 Subject: [PATCH 4/4] fix --- .github/workflows/tauri_app_build.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tauri_app_build.yml b/.github/workflows/tauri_app_build.yml index cf6eec4..63c7560 100644 --- a/.github/workflows/tauri_app_build.yml +++ b/.github/workflows/tauri_app_build.yml @@ -182,7 +182,7 @@ jobs: - name: Upload Artifacts uses: actions/upload-artifact@v4 with: - name: bundle-${{ env.VERSION }}-${{ runner.os }} + name: bundle-${{ env.VERSION }}-${{ runner.os }}-pre path: | vue/src-tauri/target/release/bundle/nsis/Infinite Image Browsing_${{ env.VERSION }}_x64-setup-pyinstaller.exe @@ -206,6 +206,11 @@ jobs: with: name: bundle-${{ env.VERSION }}-Windows path: artifacts + + - uses: actions/download-artifact@v4 + with: + name: bundle-${{ env.VERSION }}-Windows-pre + path: artifacts - uses: actions/download-artifact@v4 with: