Merge pull request #816 from zanllp/releases/1.3.0

Releases/1.3.0
pull/817/head
zanllp 2025-06-03 16:41:16 +08:00 committed by GitHub
commit f7ce68237f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 16 deletions

View File

@ -9,7 +9,7 @@ jobs:
build: build:
strategy: strategy:
matrix: matrix:
os: [windows-latest,ubuntu-20.04] os: [windows-latest,ubuntu-22.04]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
@ -20,7 +20,7 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- run: echo "VERSION=$(jq -r '.package.version' vue/src-tauri/tauri.conf.json)" >> "$GITHUB_ENV" - 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 - run: echo "VERSION=$(jq -r '.package.version' vue/src-tauri/tauri.conf.json)" >> $env:GITHUB_ENV
if: matrix.os == 'windows-latest' if: matrix.os == 'windows-latest'
@ -48,12 +48,12 @@ jobs:
vue/dist=vue/dist vue/dist=vue/dist
- run: cp out/iib_api_server out/iib_app_cli-${{ env.VERSION }}-${{ runner.os }} - 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 - run: cp out/iib_api_server.exe out/iib_app_cli-${{ env.VERSION }}-${{ runner.os }}.exe
if: matrix.os == 'windows-latest' if: matrix.os == 'windows-latest'
- name: Upload Server Artifacts - name: Upload Server Artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: iib_app_cli_${{ runner.os }} name: iib_app_cli_${{ runner.os }}
path: | path: |
@ -61,7 +61,7 @@ jobs:
out/iib_app_cli-${{ env.VERSION }}-${{ runner.os }}.exe out/iib_app_cli-${{ env.VERSION }}-${{ runner.os }}.exe
- name: Upload Server Artifacts - name: Upload Server Artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: iib_api_server-${{ env.VERSION }}-${{ runner.os }} name: iib_api_server-${{ env.VERSION }}-${{ runner.os }}
path: | path: |
@ -72,7 +72,7 @@ jobs:
if: matrix.os == 'windows-latest' if: matrix.os == 'windows-latest'
- run: mv out/iib_api_server vue/src-tauri/iib_api_server-x86_64-unknown-linux-gnu - 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 - name: Install frontend dependencies
run: yarn install run: yarn install
@ -92,7 +92,7 @@ jobs:
workspaces: './vue/src-tauri -> target' workspaces: './vue/src-tauri -> target'
- name: Install dependencies (ubuntu only) - name: Install dependencies (ubuntu only)
if: matrix.os == 'ubuntu-20.04' if: matrix.os == 'ubuntu-22.04'
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf
@ -104,7 +104,7 @@ jobs:
- name: Upload Artifacts - name: Upload Artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: bundle-${{ env.VERSION }}-${{ runner.os }} name: bundle-${{ env.VERSION }}-${{ runner.os }}
path: | path: |
@ -165,7 +165,7 @@ jobs:
workspaces: './vue/src-tauri -> target' workspaces: './vue/src-tauri -> target'
- name: Install dependencies (ubuntu only) - name: Install dependencies (ubuntu only)
if: matrix.os == 'ubuntu-20.04' if: matrix.os == 'ubuntu-22.04'
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf
@ -180,9 +180,9 @@ jobs:
mv "Infinite Image Browsing_${{ env.VERSION }}_x64-setup.exe" "Infinite Image Browsing_${{ env.VERSION }}_x64-setup-pyinstaller.exe" mv "Infinite Image Browsing_${{ env.VERSION }}_x64-setup.exe" "Infinite Image Browsing_${{ env.VERSION }}_x64-setup-pyinstaller.exe"
- name: Upload Artifacts - name: Upload Artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: bundle-${{ env.VERSION }}-${{ runner.os }} name: bundle-${{ env.VERSION }}-${{ runner.os }}-pre
path: | path: |
vue/src-tauri/target/release/bundle/nsis/Infinite Image Browsing_${{ env.VERSION }}_x64-setup-pyinstaller.exe vue/src-tauri/target/release/bundle/nsis/Infinite Image Browsing_${{ env.VERSION }}_x64-setup-pyinstaller.exe
@ -202,22 +202,27 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/download-artifact@v3 - uses: actions/download-artifact@v4
with: with:
name: bundle-${{ env.VERSION }}-Windows name: bundle-${{ env.VERSION }}-Windows
path: artifacts path: artifacts
- uses: actions/download-artifact@v3 - uses: actions/download-artifact@v4
with:
name: bundle-${{ env.VERSION }}-Windows-pre
path: artifacts
- uses: actions/download-artifact@v4
with: with:
name: bundle-${{ env.VERSION }}-Linux name: bundle-${{ env.VERSION }}-Linux
path: artifacts path: artifacts
- uses: actions/download-artifact@v3 - uses: actions/download-artifact@v4
with: with:
name: iib_app_cli_Windows name: iib_app_cli_Windows
path: artifacts path: artifacts
- uses: actions/download-artifact@v3 - uses: actions/download-artifact@v4
with: with:
name: iib_app_cli_Linux name: iib_app_cli_Linux
path: artifacts path: artifacts

View File

@ -8,7 +8,7 @@
}, },
"package": { "package": {
"productName": "Infinite Image Browsing", "productName": "Infinite Image Browsing",
"version": "1.2.0" "version": "1.3.0"
}, },
"tauri": { "tauri": {
"allowlist": { "allowlist": {