Skip to content

Commit 6cba66c

Browse files
committed
Merge branch 'nightly' of https://github.com/floatyfp/floaty into nightly
2 parents aeede91 + f1cabb3 commit 6cba66c

1 file changed

Lines changed: 17 additions & 5 deletions

File tree

.github/workflows/debugbuild.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
jobs:
1717
LINUXANDROID:
1818
name: Linux & Android
19-
runs-on: ubuntu-latest
19+
runs-on: ubuntu-22.04 # Changed from ubuntu-latest to ubuntu-22.04 for older glibc
2020
steps:
2121
- name: Checkout repository
2222
uses: actions/checkout@v4
@@ -60,8 +60,17 @@ jobs:
6060
- name: Install Fastforge
6161
run: dart pub global activate fastforge
6262

63-
- name: Build and release
64-
run: fastforge release --name ${{ github.ref_name }}linux
63+
- name: Build and release (with retry for deb packager bug)
64+
run: |
65+
# First attempt - may fail due to deb packager bug
66+
echo "First build attempt..."
67+
if ! fastforge release --name ${{ github.ref_name }}linux; then
68+
echo "First build failed (expected due to deb packager bug), retrying..."
69+
echo "Second build attempt..."
70+
fastforge release --name ${{ github.ref_name }}linux
71+
else
72+
echo "First build succeeded!"
73+
fi
6574
6675
- name: Upload build artifacts
6776
uses: actions/upload-artifact@v4
@@ -170,6 +179,7 @@ jobs:
170179
171180
if [ -d "./artifacts/dist-linux-android" ]; then
172181
find ./artifacts/dist-linux-android -name "*.rpm" -exec cp {} release/linux/ \;
182+
find ./artifacts/dist-linux-android -name "*.deb" -exec cp {} release/linux/ \;
173183
find ./artifacts/dist-linux-android -name "*.AppImage" -exec cp {} release/linux/ \;
174184
find ./artifacts/dist-linux-android -name "*.apk" -exec cp {} release/android/ \;
175185
fi
@@ -227,7 +237,7 @@ jobs:
227237
echo ' },' >> release/manifest.json
228238
fi
229239
230-
if ls release/linux/*.rpm >/dev/null 2>&1 || ls release/linux/*.AppImage >/dev/null 2>&1; then
240+
if ls release/linux/*.rpm >/dev/null 2>&1 || ls release/linux/*.deb >/dev/null 2>&1 || ls release/linux/*.AppImage >/dev/null 2>&1; then
231241
echo ' {' >> release/manifest.json
232242
echo ' "platform": "linux",' >> release/manifest.json
233243
echo ' "files": [' >> release/manifest.json
@@ -239,6 +249,8 @@ jobs:
239249
filename=$(basename "$file")
240250
if [[ "$filename" == *.rpm ]]; then
241251
echo -n " {\"type\": \"RPM\", \"path\": \"linux/$filename\"}" >> release/manifest.json
252+
elif [[ "$filename" == *.deb ]]; then
253+
echo -n " {\"type\": \"DEB\", \"path\": \"linux/$filename\"}" >> release/manifest.json
242254
elif [[ "$filename" == *.AppImage ]]; then
243255
echo -n " {\"type\": \"AppImage\", \"path\": \"linux/$filename\"}" >> release/manifest.json
244256
fi
@@ -366,7 +378,7 @@ jobs:
366378
🔗 **[View Changelogs](https://floaty.fyi/changelogs#${{ steps.deploy.outputs.deployment_id }})**
367379
368380
This release includes builds for:
369-
${{ needs.LINUXANDROID.result == 'success' && '- 🐧 Linux (RPM, AppImage)' || '' }}
381+
${{ needs.LINUXANDROID.result == 'success' && '- 🐧 Linux (RPM, DEB, AppImage)' || '' }}
370382
${{ needs.LINUXANDROID.result == 'success' && '- 🤖 Android (APK)' || '' }}
371383
${{ needs.WINDOWS.result == 'success' && '- 🪟 Windows (EXE Installer)' || '' }}
372384
${{ needs.MACOSIOS.result == 'success' && '- 🍎 macOS (DMG, PKG)' || '' }}

0 commit comments

Comments
 (0)