Skip to content

Commit f8988a0

Browse files
GleammerRayGleammerRay
authored
Merge pull request #195 from GlitterWare/dev
v1.10.1 - Passy Cloud - Export Hotfix
2 parents ce05145 + cb2c41e commit f8988a0

File tree

11 files changed

+115
-124
lines changed

11 files changed

+115
-124
lines changed

‎.github/workflows/build-all-ci.yml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ jobs:
1212
runs-on: ubuntu-22.04
1313
steps:
1414
- name: Checkout repository
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v6
1616
- name: Install dependencies
1717
shell: bash
1818
run: |
1919
sudo apt-get update
2020
DEBIAN_FRONTEND=noninteractive sudo apt-get -y install clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev binutils coreutils desktop-file-utils fakeroot fuse libgdk-pixbuf2.0-dev patchelf python3-pip python3-setuptools squashfs-tools strace util-linux zsync
2121
- name: Set up JDK 17
22-
uses: actions/setup-java@v4
22+
uses: actions/setup-java@v5
2323
with:
2424
java-version: '17'
2525
distribution: 'adopt'
@@ -44,7 +44,7 @@ jobs:
4444
mkdir build
4545
cp Passy/build/app/outputs/flutter-apk/app-release.apk build/Passy-Android.apk
4646
- name: Upload Android build
47-
uses: actions/upload-artifact@v4
47+
uses: actions/upload-artifact@v7
4848
with:
4949
name: android
5050
path: /home/runner/work/Passy/build/Passy-Android.apk
@@ -53,7 +53,7 @@ jobs:
5353
runs-on: ubuntu-22.04
5454
steps:
5555
- name: Checkout repository
56-
uses: actions/checkout@v4
56+
uses: actions/checkout@v6
5757
- name: Install dependencies
5858
shell: bash
5959
run: |
@@ -86,38 +86,38 @@ jobs:
8686
chmod +x build/linux-bundle/Passy/passy
8787
chmod +x build/Passy-Latest-x86_64.AppImage
8888
- name: Archive Linux bundle build
89-
uses: thedoctor0/zip-release@0.7.1
89+
uses: thedoctor0/zip-release@0.7.6
9090
with:
9191
type: zip
9292
directory: ../build/linux-bundle
9393
filename: Passy-Linux-Bundle.zip
9494
path: Passy
9595
- name: Archive Linux AppImage build
96-
uses: thedoctor0/zip-release@0.7.1
96+
uses: thedoctor0/zip-release@0.7.6
9797
with:
9898
type: zip
9999
directory: ../build
100100
filename: Passy-Linux-AppImage.zip
101101
path: Passy-Latest-x86_64.AppImage
102102
- name: Archive Linux CLI build
103-
uses: thedoctor0/zip-release@0.7.1
103+
uses: thedoctor0/zip-release@0.7.6
104104
with:
105105
type: zip
106106
directory: ../build/cli
107107
filename: Passy-CLI-Linux.zip
108108
path: passy-cli
109109
- name: Upload Linux bundle build
110-
uses: actions/upload-artifact@v4
110+
uses: actions/upload-artifact@v7
111111
with:
112112
name: linux-bundle
113113
path: /home/runner/work/Passy/build/linux-bundle/Passy-Linux-Bundle.zip
114114
- name: Upload Linux AppImage build
115-
uses: actions/upload-artifact@v4
115+
uses: actions/upload-artifact@v7
116116
with:
117117
name: linux-appimage
118118
path: /home/runner/work/Passy/build/Passy-Linux-AppImage.zip
119119
- name: Upload Linux CLI build
120-
uses: actions/upload-artifact@v4
120+
uses: actions/upload-artifact@v7
121121
with:
122122
name: cli-linux
123123
path: /home/runner/work/Passy/build/cli/Passy-CLI-Linux.zip
@@ -135,26 +135,26 @@ jobs:
135135
chmod +x build/linux-bundle/Passy/passy
136136
chmod +x build/Passy-Latest-x86_64.AppImage
137137
- name: Archive Linux bundle build
138-
uses: thedoctor0/zip-release@0.7.1
138+
uses: thedoctor0/zip-release@0.7.6
139139
with:
140140
type: zip
141141
directory: ../build/linux-bundle
142142
filename: Passy-Linux-Bundle.zip
143143
path: Passy
144144
- name: Archive Linux AppImage build
145-
uses: thedoctor0/zip-release@0.7.1
145+
uses: thedoctor0/zip-release@0.7.6
146146
with:
147147
type: zip
148148
directory: ../build
149149
filename: Passy-Linux-AppImage.zip
150150
path: Passy-Latest-x86_64.AppImage
151151
- name: Upload Linux bundle no updates popup build
152-
uses: actions/upload-artifact@v4
152+
uses: actions/upload-artifact@v7
153153
with:
154154
name: linux-bundle-no-updates-popup
155155
path: /home/runner/work/Passy/build/linux-bundle/Passy-Linux-Bundle.zip
156156
- name: Upload Linux AppImage no updates popup build
157-
uses: actions/upload-artifact@v4
157+
uses: actions/upload-artifact@v7
158158
with:
159159
name: linux-appimage-no-updates-popup
160160
path: /home/runner/work/Passy/build/Passy-Linux-AppImage.zip
@@ -163,7 +163,7 @@ jobs:
163163
runs-on: ubuntu-22.04-arm
164164
steps:
165165
- name: Checkout repository
166-
uses: actions/checkout@v4
166+
uses: actions/checkout@v6
167167
- name: Install dependencies
168168
shell: bash
169169
run: |
@@ -198,38 +198,38 @@ jobs:
198198
chmod +x build/linux-bundle/Passy/passy
199199
chmod +x build/Passy-Latest-aarch64.AppImage
200200
- name: Archive Linux bundle build
201-
uses: thedoctor0/zip-release@0.7.1
201+
uses: thedoctor0/zip-release@0.7.6
202202
with:
203203
type: zip
204204
directory: ../build/linux-bundle
205205
filename: Passy-Linux-ARM64-Bundle.zip
206206
path: Passy
207207
- name: Archive Linux AppImage build
208-
uses: thedoctor0/zip-release@0.7.1
208+
uses: thedoctor0/zip-release@0.7.6
209209
with:
210210
type: zip
211211
directory: ../build
212212
filename: Passy-Linux-ARM64-AppImage.zip
213213
path: Passy-Latest-aarch64.AppImage
214214
- name: Archive Linux CLI build
215-
uses: thedoctor0/zip-release@0.7.1
215+
uses: thedoctor0/zip-release@0.7.6
216216
with:
217217
type: zip
218218
directory: ../build/cli
219219
filename: Passy-CLI-Linux-ARM64.zip
220220
path: passy-cli
221221
- name: Upload Linux bundle build
222-
uses: actions/upload-artifact@v4
222+
uses: actions/upload-artifact@v7
223223
with:
224224
name: linux-arm64-bundle
225225
path: /home/runner/work/Passy/build/linux-bundle/Passy-Linux-ARM64-Bundle.zip
226226
- name: Upload Linux AppImage build
227-
uses: actions/upload-artifact@v4
227+
uses: actions/upload-artifact@v7
228228
with:
229229
name: linux-arm64-appimage
230230
path: /home/runner/work/Passy/build/Passy-Linux-ARM64-AppImage.zip
231231
- name: Upload Linux CLI build
232-
uses: actions/upload-artifact@v4
232+
uses: actions/upload-artifact@v7
233233
with:
234234
name: cli-linux-arm64
235235
path: /home/runner/work/Passy/build/cli/Passy-CLI-Linux-ARM64.zip
@@ -247,26 +247,26 @@ jobs:
247247
chmod +x build/linux-bundle/Passy/passy
248248
chmod +x build/Passy-Latest-aarch64.AppImage
249249
- name: Archive Linux bundle build
250-
uses: thedoctor0/zip-release@0.7.1
250+
uses: thedoctor0/zip-release@0.7.6
251251
with:
252252
type: zip
253253
directory: ../build/linux-bundle
254254
filename: Passy-Linux-ARM64-Bundle.zip
255255
path: Passy
256256
- name: Archive Linux AppImage build
257-
uses: thedoctor0/zip-release@0.7.1
257+
uses: thedoctor0/zip-release@0.7.6
258258
with:
259259
type: zip
260260
directory: ../build
261261
filename: Passy-Linux-ARM64-AppImage.zip
262262
path: Passy-Latest-aarch64.AppImage
263263
- name: Upload Linux bundle no updates popup build
264-
uses: actions/upload-artifact@v4
264+
uses: actions/upload-artifact@v7
265265
with:
266266
name: linux-arm64-bundle-no-updates-popup
267267
path: /home/runner/work/Passy/build/linux-bundle/Passy-Linux-ARM64-Bundle.zip
268268
- name: Upload Linux AppImage no updates popup build
269-
uses: actions/upload-artifact@v4
269+
uses: actions/upload-artifact@v7
270270
with:
271271
name: linux-arm64-appimage-no-updates-popup
272272
path: /home/runner/work/Passy/build/Passy-Linux-ARM64-AppImage.zip
@@ -275,7 +275,7 @@ jobs:
275275
runs-on: ubuntu-24.04
276276
steps:
277277
- name: Checkout repository
278-
uses: actions/checkout@v4
278+
uses: actions/checkout@v6
279279
- name: Install flutter
280280
shell: bash
281281
run: |
@@ -290,7 +290,7 @@ jobs:
290290
uses: snapcore/action-build@v1
291291
id: snapcraft
292292
- name: Upload Linux Snap
293-
uses: actions/upload-artifact@v4
293+
uses: actions/upload-artifact@v7
294294
with:
295295
name: linux-snap
296296
path: ${{ steps.snapcraft.outputs.snap }}
@@ -299,7 +299,7 @@ jobs:
299299
runs-on: ubuntu-24.04-arm
300300
steps:
301301
- name: Checkout repository
302-
uses: actions/checkout@v4
302+
uses: actions/checkout@v6
303303
- name: Install flutter
304304
shell: bash
305305
run: |
@@ -314,7 +314,7 @@ jobs:
314314
uses: snapcore/action-build@v1
315315
id: snapcraft
316316
- name: Upload Linux Snap
317-
uses: actions/upload-artifact@v4
317+
uses: actions/upload-artifact@v7
318318
with:
319319
name: linux-snap-arm64
320320
path: ${{ steps.snapcraft.outputs.snap }}
@@ -323,7 +323,7 @@ jobs:
323323
runs-on: windows-latest
324324
steps:
325325
- name: Checkout repository
326-
uses: actions/checkout@v4
326+
uses: actions/checkout@v6
327327
- name: Install Latest VC Redistributable
328328
shell: pwsh
329329
run: |
@@ -358,12 +358,12 @@ jobs:
358358
cp -r Passy/build/windows/x64/runner/Release/. build/windows-portable/Passy
359359
cp Passy/build/Passy-Windows-Installer.exe build/Passy-Windows-Installer.exe
360360
- name: Upload Windows portable build
361-
uses: actions/upload-artifact@v4
361+
uses: actions/upload-artifact@v7
362362
with:
363363
name: windows-portable
364364
path: D:\a\Passy\build\windows-portable
365365
- name: Upload Windows .exe installer
366-
uses: actions/upload-artifact@v4
366+
uses: actions/upload-artifact@v7
367367
with:
368368
name: windows-exe-installer
369369
path: D:\a\Passy\build\Passy-Windows-Installer.exe

‎.github/workflows/build-linux-armv7-ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
runs-on: ubuntu-22.04
1313
steps:
1414
- name: Checkout repository
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v6
1616
- name: Set up QEMU
17-
uses: docker/setup-qemu-action@v2.1.0
17+
uses: docker/setup-qemu-action@v4.0.0
1818
- name: Create build directory
1919
shell: bash
2020
run: |
@@ -42,14 +42,14 @@ jobs:
4242
options: --rm --platform linux/arm/v7 -v $PWD:/Passy -v /home/runner/work/Passy/build:/passy-build -v /home/runner/work/Passy/bin:/passy-bin
4343
args: /passy-bin/armv7.sh
4444
- name: Archive Passy CLI build
45-
uses: thedoctor0/zip-release@0.7.1
45+
uses: thedoctor0/zip-release@0.7.6
4646
with:
4747
type: zip
4848
directory: ../build
4949
filename: Passy-CLI-Linux-ARMv7.zip
5050
path: passy-cli
5151
- name: Upload Passy CLI build
52-
uses: actions/upload-artifact@v4
52+
uses: actions/upload-artifact@v7
5353
with:
5454
name: cli-linux-armv7
5555
path: /home/runner/work/Passy/build/Passy-CLI-Linux-ARMv7.zip

‎download_releases.sh‎

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -29,35 +29,45 @@ mkdir -p ./build/gh_releases
2929
cd ./build/gh_releases
3030

3131
echo 'Downloading latest release artifacts...'
32-
gh run download \
33-
-n android \
34-
-n cli-linux \
35-
-n cli-linux-arm64 \
36-
-n cli-linux-armv7 \
37-
-n linux-appimage \
38-
-n linux-arm64-appimage \
39-
-n linux-arm64-bundle \
40-
-n linux-arm64-bundle-no-updates-popup \
41-
-n linux-bundle \
42-
-n linux-bundle-no-updates-popup \
43-
-n linux-snap \
44-
-n linux-snap-arm64 \
45-
-n windows-exe-installer \
46-
-n windows-portable
32+
echo '[1/10] android...'
33+
gh run download -n android
34+
sleep 5
35+
echo '[2/10] cli-linux...'
36+
gh run download -n cli-linux
37+
sleep 5
38+
echo '[3/10] cli-linux-arm...'
39+
gh run download -n cli-linux-arm64 -n cli-linux-armv7
40+
sleep 5
41+
echo '[4/10] linux-appimage...'
42+
gh run download -n linux-appimage
43+
sleep 5
44+
echo '[5/10] linux-arm64-appimage...'
45+
gh run download -n linux-arm64-appimage
46+
sleep 5
47+
echo '[6/10] linux-arm64-bundle...'
48+
gh run download -n linux-arm64-bundle -n linux-arm64-bundle-no-updates-popup
49+
sleep 5
50+
echo '[7/10] linux-bundle...'
51+
gh run download -n linux-bundle -n linux-bundle-no-updates-popup
52+
sleep 5
53+
echo '[8/10] linux-snap...'
54+
gh run download -n linux-snap
55+
sleep 5
56+
echo '[9/10] linux-snap-arm64...'
57+
gh run download -n linux-snap-arm64
58+
sleep 5
59+
echo '[10/10] windows...'
60+
gh run download -n windows-exe-installer -n windows-portable
4761
echo 'Done.'
4862

49-
echo 'Preparing Passy Snap...'
50-
cp linux-snap/* .
51-
echo 'Preparing Passy Snap ARM64...'
52-
cp linux-snap-arm64/* .
5363
echo 'Preparing Passy CLI Linux...'
54-
cp cli-linux/Passy-CLI-Linux.zip ./Passy-CLI-v$version-Linux.zip
64+
cp Passy-CLI-Linux.zip ./Passy-CLI-v$version-Linux.zip
5565
echo 'Preparing Passy CLI Linux ARM64...'
5666
cp cli-linux-arm64/Passy-CLI-Linux-ARM64.zip ./Passy-CLI-v$version-Linux-ARM64.zip
5767
echo 'Preparing Passy CLI Linux ARMv7...'
5868
cp cli-linux-armv7/Passy-CLI-Linux-ARMv7.zip ./Passy-CLI-v$version-Linux-ARMv7.zip
5969
echo 'Preparing Passy Android Apk...'
60-
cp android/Passy-Android.apk ./Passy-v$version.apk
70+
cp Passy-Android.apk ./Passy-v$version.apk
6171
zip -9 ./Passy-v$version-Android-Apk.zip Passy-v$version.apk
6272
rm Passy-v$version.apk
6373
echo 'Preparing Passy Linux ARM64...'
@@ -74,13 +84,11 @@ cd windows-portable
7484
zip -9 -r ../Passy-v$version-Windows-Portable.zip Passy
7585
cd ..
7686
echo 'Preparing Passy Linux AppImage...'
77-
cp linux-appimage/Passy-Linux-AppImage.zip .
7887
unzip Passy-Linux-AppImage.zip
7988
rm Passy-Linux-AppImage.zip
8089
chmod +x Passy-Latest-x86_64.AppImage
8190
mv Passy-Latest-x86_64.AppImage Passy-v$version-x86-64.AppImage
8291
echo 'Preparing Passy Linux ARM64 AppImage...'
83-
cp linux-arm64-appimage/Passy-Linux-ARM64-AppImage.zip .
8492
unzip Passy-Linux-ARM64-AppImage.zip
8593
rm Passy-Linux-ARM64-AppImage.zip
8694
chmod +x Passy-Latest-aarch64.AppImage

‎lib/passy_data/common.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import 'dart:io';
1818
import 'glare/glare_client.dart';
1919
import 'key_derivation_type.dart';
2020

21-
const String passyVersion = '1.10.0';
21+
const String passyVersion = '1.10.1';
2222
const String syncVersion = '2.2.0';
2323
const String accountVersion = '2.6.0';
2424

0 commit comments

Comments
 (0)