Skip to content

Commit 2640b50

Browse files
committed
add dart fixes and walled scritp
1 parent 7ad6bb3 commit 2640b50

File tree

4 files changed

+150
-78
lines changed

4 files changed

+150
-78
lines changed

.github/workflows/flutter-desktop.yml

Lines changed: 40 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@ name: XF₲ Wallet Desktop Build & Release
22

33
on:
44
push:
5-
branches: [ main, master ]
5+
branches: [main, master]
66
paths:
7-
- 'lib/**'
8-
- 'android/**'
9-
- 'ios/**'
10-
- 'macos/**'
11-
- 'windows/**'
12-
- 'linux/**'
13-
- 'pubspec.yaml'
14-
- '.github/workflows/flutter-desktop.yml'
7+
- "lib/**"
8+
- "android/**"
9+
- "ios/**"
10+
- "macos/**"
11+
- "windows/**"
12+
- "linux/**"
13+
- "pubspec.yaml"
14+
- ".github/workflows/flutter-desktop.yml"
1515
pull_request:
16-
branches: [ main, master ]
16+
branches: [main, master]
1717
paths:
18-
- 'lib/**'
19-
- 'android/**'
20-
- 'ios/**'
21-
- 'macos/**'
22-
- 'windows/**'
23-
- 'linux/**'
24-
- 'pubspec.yaml'
25-
- '.github/workflows/flutter-desktop.yml'
18+
- "lib/**"
19+
- "android/**"
20+
- "ios/**"
21+
- "macos/**"
22+
- "windows/**"
23+
- "linux/**"
24+
- "pubspec.yaml"
25+
- ".github/workflows/flutter-desktop.yml"
2626
workflow_dispatch:
2727
release:
2828
types: [published]
@@ -41,8 +41,8 @@ jobs:
4141
- name: Set up Flutter
4242
uses: subosito/flutter-action@v2
4343
with:
44-
flutter-version: '3.24.0'
45-
channel: 'stable'
44+
flutter-version: "3.24.0"
45+
channel: "stable"
4646

4747
- name: Enable macOS desktop support
4848
run: flutter config --enable-macos-desktop
@@ -93,8 +93,8 @@ jobs:
9393
- name: Set up Flutter
9494
uses: subosito/flutter-action@v2
9595
with:
96-
flutter-version: '3.24.0'
97-
channel: 'stable'
96+
flutter-version: "3.24.0"
97+
channel: "stable"
9898

9999
- name: Enable Windows desktop support
100100
run: flutter config --enable-windows-desktop
@@ -152,8 +152,8 @@ jobs:
152152
- name: Set up Flutter
153153
uses: subosito/flutter-action@v2
154154
with:
155-
flutter-version: '3.24.0'
156-
channel: 'stable'
155+
flutter-version: "3.24.0"
156+
channel: "stable"
157157

158158
- name: Download xfg-stark-cli
159159
run: |
@@ -162,6 +162,13 @@ jobs:
162162
mkdir -p assets/bin
163163
mv xfg-stark-cli-linux assets/bin/
164164
165+
- name: Download fuego-walletd
166+
run: |
167+
curl -L -o fuego-walletd-linux "https://github.com/usexfg/fuego/releases/latest/download/fuego-walletd-linux"
168+
chmod +x fuego-walletd-linux
169+
mkdir -p assets/bin
170+
mv fuego-walletd-linux assets/bin/
171+
165172
- name: Enable Linux desktop support
166173
run: |
167174
sudo apt-get update
@@ -215,7 +222,6 @@ jobs:
215222
files: build/linux/x64/release/bundle/XF₲-Wallet-Linux-GLIBC-2.31.tar.gz
216223
name: XF₲-Wallet-Linux-GLIBC-2.31.tar.gz
217224

218-
219225
build-linux-latest:
220226
name: Build XF₲ Wallet (Linux - Latest)
221227
runs-on: ubuntu-latest
@@ -227,8 +233,8 @@ jobs:
227233
- name: Set up Flutter
228234
uses: subosito/flutter-action@v2
229235
with:
230-
flutter-version: '3.24.0'
231-
channel: 'stable'
236+
flutter-version: "3.24.0"
237+
channel: "stable"
232238

233239
- name: Download xfg-stark-cli
234240
run: |
@@ -237,6 +243,13 @@ jobs:
237243
mkdir -p assets/bin
238244
mv xfg-stark-cli-linux assets/bin/
239245
246+
- name: Download fuego-walletd
247+
run: |
248+
curl -L -o fuego-walletd-linux "https://github.com/usexfg/fuego/releases/latest/download/fuego-walletd-linux"
249+
chmod +x fuego-walletd-linux
250+
mkdir -p assets/bin
251+
mv fuego-walletd-linux assets/bin/
252+
240253
- name: Enable Linux desktop support
241254
run: |
242255
sudo apt-get update

.github/workflows/linux-appstore-release.yml

Lines changed: 57 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,45 @@ name: XF₲ Wallet Linux App Store Release
22

33
on:
44
push:
5-
branches: [ main, master ]
5+
branches: [main, master]
66
paths:
7-
- 'lib/**'
8-
- 'linux/**'
9-
- 'snapcraft.yaml'
10-
- 'flatpak/**'
11-
- 'pubspec.yaml'
12-
- '.github/workflows/linux-appstore-release.yml'
7+
- "lib/**"
8+
- "linux/**"
9+
- "snapcraft.yaml"
10+
- "flatpak/**"
11+
- "pubspec.yaml"
12+
- ".github/workflows/linux-appstore-release.yml"
1313
pull_request:
14-
branches: [ main, master ]
14+
branches: [main, master]
1515
paths:
16-
- 'lib/**'
17-
- 'linux/**'
18-
- 'snapcraft.yaml'
19-
- 'flatpak/**'
20-
- 'pubspec.yaml'
21-
- '.github/workflows/linux-appstore-release.yml'
16+
- "lib/**"
17+
- "linux/**"
18+
- "snapcraft.yaml"
19+
- "flatpak/**"
20+
- "pubspec.yaml"
21+
- ".github/workflows/linux-appstore-release.yml"
2222
workflow_dispatch:
2323
inputs:
2424
build_type:
25-
description: 'Build type'
25+
description: "Build type"
2626
required: true
27-
default: 'release'
27+
default: "release"
2828
type: choice
2929
options:
30-
- release
31-
- debug
30+
- release
31+
- debug
3232
distribution_method:
33-
description: 'Distribution method'
33+
description: "Distribution method"
3434
required: true
35-
default: 'snap'
35+
default: "snap"
3636
type: choice
3737
options:
38-
- snap
39-
- flatpak
40-
- appimage
41-
- all
38+
- snap
39+
- flatpak
40+
- appimage
41+
- all
4242
upload_to_store:
43-
description: 'Upload to store'
43+
description: "Upload to store"
4444
required: false
4545
default: false
4646
type: boolean
@@ -50,16 +50,16 @@ on:
5050
contents: write
5151

5252
env:
53-
FLUTTER_VERSION: '3.24.0'
54-
SNAP_NAME: 'xfg-wallet'
55-
FLATPAK_APP_ID: 'com.fuego.fuego_wallet'
53+
FLUTTER_VERSION: "3.24.0"
54+
SNAP_NAME: "xfg-wallet"
55+
FLATPAK_APP_ID: "com.fuego.fuego_wallet"
5656

5757
jobs:
5858
build-snap:
5959
name: Build XF₲ Wallet (Snap Store)
6060
runs-on: ubuntu-latest
6161
if: github.event.inputs.distribution_method == 'snap' || github.event.inputs.distribution_method == 'all' || github.event_name != 'workflow_dispatch'
62-
62+
6363
steps:
6464
- name: Checkout code
6565
uses: actions/checkout@v4
@@ -68,7 +68,7 @@ jobs:
6868
uses: subosito/flutter-action@v2
6969
with:
7070
flutter-version: ${{ env.FLUTTER_VERSION }}
71-
channel: 'stable'
71+
channel: "stable"
7272

7373
- name: Download required binaries
7474
run: ./scripts/ensure-binaries.sh
@@ -123,7 +123,7 @@ jobs:
123123
name: Build XF₲ Wallet (Flatpak)
124124
runs-on: ubuntu-latest
125125
if: github.event.inputs.distribution_method == 'flatpak' || github.event.inputs.distribution_method == 'all' || github.event_name != 'workflow_dispatch'
126-
126+
127127
steps:
128128
- name: Checkout code
129129
uses: actions/checkout@v4
@@ -132,7 +132,7 @@ jobs:
132132
uses: subosito/flutter-action@v2
133133
with:
134134
flutter-version: ${{ env.FLUTTER_VERSION }}
135-
channel: 'stable'
135+
channel: "stable"
136136

137137
- name: Download required binaries
138138
run: ./scripts/ensure-binaries.sh
@@ -191,7 +191,7 @@ jobs:
191191
name: Build XF₲ Wallet (AppImage)
192192
runs-on: ubuntu-latest
193193
if: github.event.inputs.distribution_method == 'appimage' || github.event.inputs.distribution_method == 'all' || github.event_name != 'workflow_dispatch'
194-
194+
195195
steps:
196196
- name: Checkout code
197197
uses: actions/checkout@v4
@@ -200,7 +200,7 @@ jobs:
200200
uses: subosito/flutter-action@v2
201201
with:
202202
flutter-version: ${{ env.FLUTTER_VERSION }}
203-
channel: 'stable'
203+
channel: "stable"
204204

205205
- name: Download required binaries
206206
run: ./scripts/ensure-binaries.sh
@@ -229,7 +229,7 @@ jobs:
229229
# Download appimagetool
230230
curl -LO https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
231231
chmod +x appimagetool-x86_64.AppImage
232-
232+
233233
# Create desktop file for AppImage
234234
cat > XF₲-Wallet.desktop << 'EOF'
235235
[Desktop Entry]
@@ -241,13 +241,13 @@ jobs:
241241
Categories=Finance;
242242
Terminal=false
243243
EOF
244-
244+
245245
# Copy icon file
246-
cp ../../../../../app_icon_256.png fuego_wallet.png
247-
246+
cp ../../../../../app_icon_256.png fuego_wallet.png || cp ../../../../app_icon_256.png fuego_wallet.png
247+
248248
# Create AppImage
249249
./appimagetool-x86_64.AppImage . XF₲-Wallet-Linux.AppImage
250-
250+
251251
# Clean up
252252
rm -f appimagetool-x86_64.AppImage
253253
@@ -273,7 +273,7 @@ jobs:
273273
runs-on: ubuntu-latest
274274
needs: build-snap
275275
if: github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && github.event.inputs.upload_to_store == 'true')
276-
276+
277277
steps:
278278
- name: Checkout code
279279
uses: actions/checkout@v4
@@ -302,7 +302,7 @@ jobs:
302302
runs-on: ubuntu-latest
303303
needs: build-flatpak
304304
if: github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && github.event.inputs.upload_to_store == 'true')
305-
305+
306306
steps:
307307
- name: Checkout code
308308
uses: actions/checkout@v4
@@ -333,7 +333,7 @@ jobs:
333333
runs-on: ubuntu-latest
334334
needs: [build-snap, build-flatpak, build-appimage]
335335
if: github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && github.event.inputs.build_type == 'release')
336-
336+
337337
steps:
338338
- name: Checkout code
339339
uses: actions/checkout@v4
@@ -359,20 +359,20 @@ jobs:
359359
- name: Run security analysis
360360
run: |
361361
echo "Running Linux App Store security analysis..."
362-
362+
363363
# Check for security issues in packages
364364
echo "Checking Snap package..."
365365
if [ -f "artifacts/snap/*.snap" ]; then
366366
echo "✅ Snap package found"
367367
# Basic security checks
368368
unsquashfs -l artifacts/snap/*.snap | head -20
369369
fi
370-
370+
371371
echo "Checking Flatpak package..."
372372
if [ -f "artifacts/flatpak/xfg-wallet.flatpak" ]; then
373373
echo "✅ Flatpak package found"
374374
fi
375-
375+
376376
echo "Checking AppImage package..."
377377
if [ -f "artifacts/appimage/XF₲-Wallet-Linux.AppImage" ]; then
378378
echo "✅ AppImage package found"
@@ -383,9 +383,16 @@ jobs:
383383
notify-release:
384384
name: Notify Release
385385
runs-on: ubuntu-latest
386-
needs: [build-snap, build-flatpak, build-appimage, upload-to-snap-store, upload-to-flathub]
386+
needs:
387+
[
388+
build-snap,
389+
build-flatpak,
390+
build-appimage,
391+
upload-to-snap-store,
392+
upload-to-flathub,
393+
]
387394
if: always() && github.event_name == 'release'
388-
395+
389396
steps:
390397
- name: Notify Discord
391398
if: env.DISCORD_WEBHOOK_URL != ''
@@ -395,11 +402,11 @@ jobs:
395402
with:
396403
args: |
397404
🚀 **XF₲ Wallet Linux App Store Release ${{ github.ref_name }}**
398-
405+
399406
✅ Linux app store packages built
400407
📦 Available for Snap Store, Flatpak, and AppImage
401408
🔗 [Download from GitHub Releases](https://github.com/${{ github.repository }}/releases/tag/${{ github.ref_name }})
402-
409+
403410
**Build Details:**
404411
- Version: ${{ github.ref_name }}
405412
- Commit: ${{ github.sha }}
@@ -446,4 +453,4 @@ jobs:
446453
echo "\`\`\`bash" >> $GITHUB_STEP_SUMMARY
447454
echo "chmod +x XF₲-Wallet-Linux.AppImage" >> $GITHUB_STEP_SUMMARY
448455
echo "./XF₲-Wallet-Linux.AppImage" >> $GITHUB_STEP_SUMMARY
449-
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
456+
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY

0 commit comments

Comments
 (0)