make sure flatpaks end up in artifacts and first run at arm64 flatpak

merge-requests/237/merge^2
Matthew Chambers 2022-10-16 10:24:54 -05:00 zatwierdzone przez nr0q
rodzic a438cfa281
commit 5f031c1d89
1 zmienionych plików z 9 dodań i 1 usunięć

Wyświetl plik

@ -143,7 +143,7 @@ linux:package:
apt-get install flatpak flatpak-builder -y
flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
flatpak install org.freedesktop.Sdk//22.08 -y
flatpak install org.freedesktop.Platform/x86_64/22.08 -y
flatpak install org.freedesktop.Platform//22.08 -y
echo -e "\e[0Ksection_end:`date +%s`:apt_get\r\e[0K"
script:
- |
@ -170,6 +170,7 @@ linux:package:
echo -e "\e[0Ksection_start:`date +%s`:flatpaks\e[0K"
flatpak-builder flatpak flatpakmanifest.yml --force-clean --repo=flatpakrepo
flatpak build-bundle flatpakrepo gridtracker-$CI_COMMIT_TAG-x86_64.flatpak org.gridtracker.GridTracker
mv *.flatpak artifacts/
echo -e "\e[0Ksection_end:`date +%s`:flatpaks\r\e[0K"
echo "we made LINUX packages!"
ls -laR artifacts
@ -239,6 +240,8 @@ arm:package:
echo -e "\e[0Ksection_start:`date +%s`:apt_get[collapsed=true]\r\e[0KGetting Build Dependencies"
apt-get update && apt-get upgrade -y
apt-get build-dep .
flatpak install org.freedesktop.Sdk//22.08 -y
flatpak install org.freedesktop.Platform/arm6/22.08 -y
echo -e "\e[0Ksection_end:`date +%s`:apt_get\r\e[0K"
script:
- |
@ -273,6 +276,11 @@ arm:package:
cp LICENSE GridTracker-$version-linux-arm64/
tar -czf GridTracker-$version-linux-arm64.tar.gz GridTracker-$version-linux-arm64
mv GridTracker-$version-linux-arm64.tar.gz artifacts/
echo -e "\e[0Ksection_start:`date +%s`:flatpaks\e[0K"
cp -r GridTracker-$version-linux-arm64 dist/GridTracker-$version-linux-arm64
flatpak-builder flatpak flatpakmanifest.yml --force-clean --repo=flatpakrepo
flatpak build-bundle flatpakrepo gridtracker-$CI_COMMIT_TAG-arm64.flatpak org.gridtracker.GridTracker
mv *.flatpak artifacts/
echo "we made ARM packages!"
ls -laR artifacts