Skip to content

Commit c5c5978

Browse files
TohruskyTohrusky
authored
refactor: use Final2x-core v3.0.0 (ccrestoration) (#599)
1 parent bfc090d commit c5c5978

25 files changed

+4069
-4193
lines changed

‎.github/workflows/CI-Build.yml‎ renamed to ‎.github/workflows/CI-build.yml‎

Lines changed: 27 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CI-Build
1+
name: CI-build
22

33
on:
44
push:
@@ -44,13 +44,13 @@ jobs:
4444
if: matrix.os-version == 'x64'
4545
run: |
4646
cd .\dist\win-unpacked
47-
7z a -r Final2x-windows-${{ matrix.os-version }}-unpacked.zip *
47+
7z a -r Final2x-windows-${{ matrix.os-version }}-unpacked.7z *
4848
4949
- name: zip-unpacked-arm64
5050
if: matrix.os-version == 'arm64'
5151
run: |
5252
cd .\dist\win-arm64-unpacked
53-
7z a -r Final2x-windows-${{ matrix.os-version }}-unpacked.zip *
53+
7z a -r Final2x-windows-${{ matrix.os-version }}-unpacked.7z *
5454
5555
- name: upload-setup
5656
uses: actions/upload-artifact@v3
@@ -63,21 +63,21 @@ jobs:
6363
uses: actions/upload-artifact@v3
6464
with:
6565
name: Final2x-windows-${{ matrix.os-version }}-unpacked
66-
path: dist/win-unpacked/Final2x-windows-${{ matrix.os-version }}-unpacked.zip
66+
path: dist/win-unpacked/*.7z
6767

6868
- name: upload-unpacked-arm64
6969
if: matrix.os-version == 'arm64'
7070
uses: actions/upload-artifact@v3
7171
with:
7272
name: Final2x-windows-${{ matrix.os-version }}-unpacked
73-
path: dist/win-arm64-unpacked/Final2x-windows-${{ matrix.os-version }}-unpacked.zip
73+
path: dist/win-arm64-unpacked/*.7z
7474

7575
macos:
7676
strategy:
7777
matrix:
7878
os-version: ['x64', 'arm64']
7979

80-
runs-on: macos-latest
80+
runs-on: macos-14
8181
steps:
8282
- uses: actions/checkout@v3
8383
with:
@@ -99,72 +99,37 @@ jobs:
9999
ARCH: ${{ matrix.os-version }}
100100
GH_TOKEN: ${{ secrets.GH_TOKEN }}
101101

102-
- name: upload-dmg
103-
uses: actions/upload-artifact@v3
104-
with:
105-
name: Final2x-macos-${{ matrix.os-version }}-dmg
106-
path: dist/*.dmg
107-
108-
- name: upload-unpacked
109-
uses: actions/upload-artifact@v3
110-
with:
111-
name: Final2x-macos-${{ matrix.os-version }}-unpacked
112-
path: dist/*.zip
113-
114-
ubuntu:
115-
strategy:
116-
matrix:
117-
os-version: ['x64']
118-
119-
runs-on: ubuntu-20.04
120-
steps:
121-
- uses: actions/checkout@v3
122-
with:
123-
submodules: recursive
124-
125-
- uses: actions/setup-node@v3
126-
with:
127-
node-version: 20
128-
129-
- uses: pnpm/action-setup@v2
130-
with:
131-
version: 8
132-
133-
- name: build
102+
- name: zip-unpacked-x64
103+
if: matrix.os-version == 'x64'
134104
run: |
135-
pnpm install
136-
pnpm run build:linux-${{ matrix.os-version }}
137-
env:
138-
GH_TOKEN: ${{ secrets.GH_TOKEN }}
105+
cd ./dist/mac
106+
7z a -r Final2x-macos-${{ matrix.os-version }}-unpacked.7z *
139107
140-
- name: zip-unpacked
108+
- name: zip-unpacked-arm64
109+
if: matrix.os-version == 'arm64'
141110
run: |
142-
cd ./dist/linux-unpacked
143-
zip -9 -r Final2x-ubuntu-${{ matrix.os-version }}-unpacked.zip ./*
144-
145-
- name: upload-snap
146-
uses: actions/upload-artifact@v3
147-
with:
148-
name: Final2x-ubuntu-${{ matrix.os-version }}-snap
149-
path: dist/*.snap
111+
cd ./dist/mac-arm64
112+
7z a -r Final2x-macos-${{ matrix.os-version }}-unpacked.7z *
150113
151-
- name: upload-AppImage
114+
- name: upload-dmg
152115
uses: actions/upload-artifact@v3
153116
with:
154-
name: Final2x-ubuntu-${{ matrix.os-version }}-AppImage
155-
path: dist/*.AppImage
117+
name: Final2x-macos-${{ matrix.os-version }}-dmg
118+
path: dist/*.dmg
156119

157-
- name: upload-deb
120+
- name: upload-unpacked-x64
121+
if: matrix.os-version == 'x64'
158122
uses: actions/upload-artifact@v3
159123
with:
160-
name: Final2x-ubuntu-${{ matrix.os-version }}-deb
161-
path: dist/*.deb
124+
name: Final2x-macos-${{ matrix.os-version }}-unpacked
125+
path: dist/mac/*.7z
162126

163-
- name: upload-unpacked
127+
- name: upload-unpacked-arm64
128+
if: matrix.os-version == 'arm64'
164129
uses: actions/upload-artifact@v3
165130
with:
166-
name: Final2x-ubuntu-${{ matrix.os-version }}-unpacked
167-
path: dist/linux-unpacked/Final2x-ubuntu-${{ matrix.os-version }}-unpacked.zip
131+
name: Final2x-macos-${{ matrix.os-version }}-unpacked
132+
path: dist/mac-arm64/*.7z
168133

169134
linux-pip:
170135
strategy:
@@ -196,7 +161,7 @@ jobs:
196161
- name: zip-unpacked
197162
run: |
198163
cd ./dist/linux-unpacked
199-
zip -9 -r Final2x-linux-pip-${{ matrix.os-version }}-unpacked.zip ./*
164+
7z a -r Final2x-linux-pip-${{ matrix.os-version }}-unpacked.7z *
200165
201166
- name: upload-snap
202167
uses: actions/upload-artifact@v3
@@ -220,4 +185,4 @@ jobs:
220185
uses: actions/upload-artifact@v3
221186
with:
222187
name: Final2x-linux-pip-${{ matrix.os-version }}-unpacked
223-
path: dist/linux-unpacked/Final2x-linux-pip-${{ matrix.os-version }}-unpacked.zip
188+
path: dist/linux-unpacked/*.7z

‎.github/workflows/CI-Test.yml‎ renamed to ‎.github/workflows/CI-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CI-Test
1+
name: CI-test
22

33
on:
44
push:
@@ -14,7 +14,7 @@ on:
1414
workflow_dispatch:
1515

1616
jobs:
17-
CI-Test:
17+
test:
1818
strategy:
1919
matrix:
2020
os-version: ['macos-latest', 'windows-latest', 'ubuntu-20.04']

‎.github/workflows/Release.yml‎

Lines changed: 24 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ jobs:
4343
if: matrix.os-version == 'x64'
4444
run: |
4545
cd .\dist\win-unpacked
46-
7z a -r Final2x-windows-${{ matrix.os-version }}-unpacked.zip *
46+
7z a -r Final2x-windows-${{ matrix.os-version }}-unpacked.7z *
4747
4848
- name: zip-unpacked-arm64
4949
if: matrix.os-version == 'arm64'
5050
run: |
5151
cd .\dist\win-arm64-unpacked
52-
7z a -r Final2x-windows-${{ matrix.os-version }}-unpacked.zip *
52+
7z a -r Final2x-windows-${{ matrix.os-version }}-unpacked.7z *
5353
5454
- name: rename
5555
run: |
@@ -66,20 +66,20 @@ jobs:
6666
if: matrix.os-version == 'x64'
6767
uses: actions/upload-artifact@v3
6868
with:
69-
path: dist/win-unpacked/Final2x-windows-${{ matrix.os-version }}-unpacked.zip
69+
path: dist/win-unpacked/*.7z
7070

7171
- name: upload-unpacked-arm64
7272
if: matrix.os-version == 'arm64'
7373
uses: actions/upload-artifact@v3
7474
with:
75-
path: dist/win-arm64-unpacked/Final2x-windows-${{ matrix.os-version }}-unpacked.zip
75+
path: dist/win-arm64-unpacked/*.7z
7676

7777
macos:
7878
strategy:
7979
matrix:
8080
os-version: ['x64', 'arm64']
8181

82-
runs-on: macos-latest
82+
runs-on: macos-14
8383
steps:
8484
- uses: actions/checkout@v3
8585
with:
@@ -105,75 +105,35 @@ jobs:
105105
run: |
106106
cd ./dist
107107
mv *.dmg Final2x-macos-${{ matrix.os-version }}-dmg.dmg
108-
mv *.zip Final2x-macos-${{ matrix.os-version }}-unpacked.zip
109108
110-
- name: upload-dmg
111-
uses: actions/upload-artifact@v3
112-
with:
113-
path: dist/*.dmg
114-
115-
- name: upload-unpacked
116-
uses: actions/upload-artifact@v3
117-
with:
118-
path: dist/*.zip
119-
120-
ubuntu:
121-
strategy:
122-
matrix:
123-
os-version: ['x64']
124-
125-
runs-on: ubuntu-20.04
126-
steps:
127-
- uses: actions/checkout@v3
128-
with:
129-
submodules: recursive
130-
131-
- uses: actions/setup-node@v3
132-
with:
133-
node-version: 20
134-
135-
- uses: pnpm/action-setup@v2
136-
with:
137-
version: 8
138-
139-
- name: build
140-
run: |
141-
pnpm install
142-
pnpm run build:linux-${{ matrix.os-version }}
143-
env:
144-
GH_TOKEN: ${{ secrets.GH_TOKEN }}
145-
146-
- name: zip-unpacked
109+
- name: zip-unpacked-x64
110+
if: matrix.os-version == 'x64'
147111
run: |
148-
cd ./dist/linux-unpacked
149-
zip -9 -r Final2x-ubuntu-${{ matrix.os-version }}-unpacked.zip ./*
112+
cd ./dist/mac
113+
7z a -r Final2x-macos-${{ matrix.os-version }}-unpacked.7z *
150114
151-
- name: rename
115+
- name: zip-unpacked-arm64
116+
if: matrix.os-version == 'arm64'
152117
run: |
153-
cd ./dist
154-
mv *.snap Final2x-ubuntu-${{ matrix.os-version }}-snap.snap
155-
mv *.AppImage Final2x-ubuntu-${{ matrix.os-version }}-AppImage.AppImage
156-
mv *.deb Final2x-ubuntu-${{ matrix.os-version }}-deb.deb
118+
cd ./dist/mac-arm64
119+
7z a -r Final2x-macos-${{ matrix.os-version }}-unpacked.7z *
157120
158-
- name: upload-snap
159-
uses: actions/upload-artifact@v3
160-
with:
161-
path: dist/*.snap
162-
163-
- name: upload-AppImage
121+
- name: upload-dmg
164122
uses: actions/upload-artifact@v3
165123
with:
166-
path: dist/*.AppImage
124+
path: dist/*.dmg
167125

168-
- name: upload-deb
126+
- name: upload-unpacked-x64
127+
if: matrix.os-version == 'x64'
169128
uses: actions/upload-artifact@v3
170129
with:
171-
path: dist/*.deb
130+
path: dist/mac/*.7z
172131

173-
- name: upload-unpacked
132+
- name: upload-unpacked-arm64
133+
if: matrix.os-version == 'arm64'
174134
uses: actions/upload-artifact@v3
175135
with:
176-
path: dist/linux-unpacked/Final2x-ubuntu-${{ matrix.os-version }}-unpacked.zip
136+
path: dist/mac-arm64/*.7z
177137

178138
linux-pip:
179139
strategy:
@@ -205,7 +165,7 @@ jobs:
205165
- name: zip-unpacked
206166
run: |
207167
cd ./dist/linux-unpacked
208-
zip -9 -r Final2x-linux-pip-${{ matrix.os-version }}-unpacked.zip ./*
168+
7z a -r Final2x-linux-pip-${{ matrix.os-version }}-unpacked.7z *
209169
210170
- name: rename
211171
run: |
@@ -232,10 +192,10 @@ jobs:
232192
- name: upload-unpacked
233193
uses: actions/upload-artifact@v3
234194
with:
235-
path: dist/linux-unpacked/Final2x-linux-pip-${{ matrix.os-version }}-unpacked.zip
195+
path: dist/linux-unpacked/*.7z
236196

237197
Release:
238-
needs: [setup, windows, macos, ubuntu, linux-pip]
198+
needs: [setup, windows, macos, linux-pip]
239199
runs-on: ubuntu-latest
240200
steps:
241201
- uses: actions/download-artifact@v3

‎package.json‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Final2x",
33
"productName": "Final2x",
4-
"version": "1.3.2",
4+
"version": "2.0.0",
55
"description": "A cross-platform image super-resolution tool.",
66
"main": "./out/main/index.js",
77
"author": "Tohrusky",
@@ -21,7 +21,8 @@
2121
"build:mac-x64": "pnpm run build && electron-builder --mac --x64",
2222
"build:win-arm64": "pnpm run build && electron-builder --win --arm64",
2323
"build:win-x64": "pnpm run build && electron-builder --win --x64",
24-
"build:linux-x64": "pnpm run build && electron-builder --linux --x64"
24+
"build:linux-x64": "pnpm run build && electron-builder --linux --x64",
25+
"build:linux-arm64": "pnpm run build && electron-builder --linux --arm64"
2526
},
2627
"engines": {
2728
"node": ">=18.0.0"
@@ -30,15 +31,15 @@
3031
"@intlify/unplugin-vue-i18n": "^4.0.0",
3132
"@vicons/antd": "^0.12.0",
3233
"@vicons/ionicons5": "^0.12.0",
33-
"core-js": "^3.38.1",
34-
"naive-ui": "^2.39.0",
35-
"pinia": "^2.2.2",
34+
"core-js": "^3.39.0",
35+
"naive-ui": "^2.40.1",
36+
"pinia": "^2.2.6",
3637
"pinia-plugin-persistedstate": "^3.2.3",
37-
"sass": "^1.79.3",
38+
"sass": "^1.80.6",
3839
"systeminformation": "^5.23.5",
3940
"vfonts": "^0.0.3",
40-
"vue": "^3.5.8",
41-
"vue-i18n": "^9.14.0",
41+
"vue": "^3.5.12",
42+
"vue-i18n": "^9.14.1",
4243
"vue-router": "^4.4.5"
4344
},
4445
"devDependencies": {
@@ -54,17 +55,17 @@
5455
"@vue/eslint-config-typescript": "^13.0.0",
5556
"@vue/test-utils": "^2.4.6",
5657
"electron": "^27.3.11",
57-
"electron-builder": "^24.13.3",
58+
"electron-builder": "^23.6.0",
5859
"electron-vite": "^2.3.0",
5960
"eslint": "^8.57.1",
60-
"eslint-plugin-vue": "^9.28.0",
61+
"eslint-plugin-vue": "^9.30.0",
6162
"extract-zip": "^2.0.1",
6263
"jsdom": "^24.1.3",
6364
"node-fetch": "^3.3.2",
6465
"prettier": "^3.3.3",
65-
"typescript": "^5.6.2",
66-
"vite": "^5.4.7",
66+
"typescript": "^5.6.3",
67+
"vite": "^5.4.10",
6768
"vitest": "^1.6.0",
68-
"vue-tsc": "^2.1.6"
69+
"vue-tsc": "^2.1.10"
6970
}
7071
}

0 commit comments

Comments
 (0)