Skip to content

Commit f7ce682

Browse files
authored
Merge pull request #816 from zanllp/releases/1.3.0
Releases/1.3.0
2 parents 5c239d5 + b4ba2f9 commit f7ce682

File tree

2 files changed

+21
-16
lines changed

2 files changed

+21
-16
lines changed

.github/workflows/tauri_app_build.yml

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
build:
1010
strategy:
1111
matrix:
12-
os: [windows-latest,ubuntu-20.04]
12+
os: [windows-latest,ubuntu-22.04]
1313

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

@@ -20,7 +20,7 @@ jobs:
2020
uses: actions/checkout@v3
2121

2222
- run: echo "VERSION=$(jq -r '.package.version' vue/src-tauri/tauri.conf.json)" >> "$GITHUB_ENV"
23-
if: matrix.os == 'ubuntu-20.04'
23+
if: matrix.os == 'ubuntu-22.04'
2424
- run: echo "VERSION=$(jq -r '.package.version' vue/src-tauri/tauri.conf.json)" >> $env:GITHUB_ENV
2525
if: matrix.os == 'windows-latest'
2626

@@ -48,20 +48,20 @@ jobs:
4848
vue/dist=vue/dist
4949
5050
- run: cp out/iib_api_server out/iib_app_cli-${{ env.VERSION }}-${{ runner.os }}
51-
if: matrix.os == 'ubuntu-20.04'
51+
if: matrix.os == 'ubuntu-22.04'
5252
- run: cp out/iib_api_server.exe out/iib_app_cli-${{ env.VERSION }}-${{ runner.os }}.exe
5353
if: matrix.os == 'windows-latest'
5454

5555
- name: Upload Server Artifacts
56-
uses: actions/upload-artifact@v3
56+
uses: actions/upload-artifact@v4
5757
with:
5858
name: iib_app_cli_${{ runner.os }}
5959
path: |
6060
out/iib_app_cli-${{ env.VERSION }}-${{ runner.os }}
6161
out/iib_app_cli-${{ env.VERSION }}-${{ runner.os }}.exe
6262
6363
- name: Upload Server Artifacts
64-
uses: actions/upload-artifact@v3
64+
uses: actions/upload-artifact@v4
6565
with:
6666
name: iib_api_server-${{ env.VERSION }}-${{ runner.os }}
6767
path: |
@@ -72,7 +72,7 @@ jobs:
7272
if: matrix.os == 'windows-latest'
7373

7474
- run: mv out/iib_api_server vue/src-tauri/iib_api_server-x86_64-unknown-linux-gnu
75-
if: matrix.os == 'ubuntu-20.04'
75+
if: matrix.os == 'ubuntu-22.04'
7676

7777
- name: Install frontend dependencies
7878
run: yarn install
@@ -92,7 +92,7 @@ jobs:
9292
workspaces: './vue/src-tauri -> target'
9393

9494
- name: Install dependencies (ubuntu only)
95-
if: matrix.os == 'ubuntu-20.04'
95+
if: matrix.os == 'ubuntu-22.04'
9696
run: |
9797
sudo apt-get update
9898
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf
@@ -104,7 +104,7 @@ jobs:
104104

105105

106106
- name: Upload Artifacts
107-
uses: actions/upload-artifact@v3
107+
uses: actions/upload-artifact@v4
108108
with:
109109
name: bundle-${{ env.VERSION }}-${{ runner.os }}
110110
path: |
@@ -165,7 +165,7 @@ jobs:
165165
workspaces: './vue/src-tauri -> target'
166166

167167
- name: Install dependencies (ubuntu only)
168-
if: matrix.os == 'ubuntu-20.04'
168+
if: matrix.os == 'ubuntu-22.04'
169169
run: |
170170
sudo apt-get update
171171
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf
@@ -180,9 +180,9 @@ jobs:
180180
mv "Infinite Image Browsing_${{ env.VERSION }}_x64-setup.exe" "Infinite Image Browsing_${{ env.VERSION }}_x64-setup-pyinstaller.exe"
181181
182182
- name: Upload Artifacts
183-
uses: actions/upload-artifact@v3
183+
uses: actions/upload-artifact@v4
184184
with:
185-
name: bundle-${{ env.VERSION }}-${{ runner.os }}
185+
name: bundle-${{ env.VERSION }}-${{ runner.os }}-pre
186186
path: |
187187
vue/src-tauri/target/release/bundle/nsis/Infinite Image Browsing_${{ env.VERSION }}_x64-setup-pyinstaller.exe
188188
@@ -202,22 +202,27 @@ jobs:
202202
env:
203203
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
204204

205-
- uses: actions/download-artifact@v3
205+
- uses: actions/download-artifact@v4
206206
with:
207207
name: bundle-${{ env.VERSION }}-Windows
208208
path: artifacts
209+
210+
- uses: actions/download-artifact@v4
211+
with:
212+
name: bundle-${{ env.VERSION }}-Windows-pre
213+
path: artifacts
209214

210-
- uses: actions/download-artifact@v3
215+
- uses: actions/download-artifact@v4
211216
with:
212217
name: bundle-${{ env.VERSION }}-Linux
213218
path: artifacts
214219

215-
- uses: actions/download-artifact@v3
220+
- uses: actions/download-artifact@v4
216221
with:
217222
name: iib_app_cli_Windows
218223
path: artifacts
219224

220-
- uses: actions/download-artifact@v3
225+
- uses: actions/download-artifact@v4
221226
with:
222227
name: iib_app_cli_Linux
223228
path: artifacts

vue/src-tauri/tauri.conf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"package": {
1010
"productName": "Infinite Image Browsing",
11-
"version": "1.2.0"
11+
"version": "1.3.0"
1212
},
1313
"tauri": {
1414
"allowlist": {

0 commit comments

Comments
 (0)