Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 20 additions & 15 deletions .github/workflows/tauri_app_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build:
strategy:
matrix:
os: [windows-latest,ubuntu-20.04]
os: [windows-latest,ubuntu-22.04]

runs-on: ${{ matrix.os }}

Expand All @@ -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'

Expand Down Expand Up @@ -48,20 +48,20 @@ 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'

- name: Upload Server Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: iib_app_cli_${{ runner.os }}
path: |
out/iib_app_cli-${{ env.VERSION }}-${{ runner.os }}
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: |
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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: |
Expand Down Expand Up @@ -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
Expand All @@ -180,9 +180,9 @@ 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 }}
name: bundle-${{ env.VERSION }}-${{ runner.os }}-pre
path: |
vue/src-tauri/target/release/bundle/nsis/Infinite Image Browsing_${{ env.VERSION }}_x64-setup-pyinstaller.exe

Expand All @@ -202,22 +202,27 @@ 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@v4
with:
name: bundle-${{ env.VERSION }}-Windows-pre
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
Expand Down
2 changes: 1 addition & 1 deletion vue/src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"package": {
"productName": "Infinite Image Browsing",
"version": "1.2.0"
"version": "1.3.0"
},
"tauri": {
"allowlist": {
Expand Down
Loading