Commit 862667a8 authored by Martin Höher's avatar Martin Höher

Finalize Flatpak build in CI

parent 92928104
Pipeline #43633413 passed with stages
in 13 minutes and 4 seconds
......@@ -3,6 +3,7 @@ variables:
WIN64_IMAGE: registry.gitlab.com/rpdev/opentodolist:win64
UBUNTU_IMAGE: registry.gitlab.com/rpdev/opentodolist:ubuntu
ANDROID_IMAGE: registry.gitlab.com/rpdev/opentodolist:android
FLATPAK_IMAGE: registry.gitlab.com/rpdev/opentodolist:flatpak
NEXTCLOUD_IMAGE: nextcloud
OWNCLOUD_IMAGE: owncloud
CTEST_OUTPUT_ON_FAILURE: 1
......@@ -75,6 +76,20 @@ build_image_android:
when: manual
# Build the Flatpak Image
build_image_flatpak:
stage: images
image: docker:git
services:
- docker:dind
script:
- cd ci/docker/flatpak
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.com
- docker build --pull -t $FLATPAK_IMAGE .
- docker push $FLATPAK_IMAGE
when: manual
################################################################################
# Build Stage
################################################################################
......@@ -162,7 +177,7 @@ android_x86:
# Build the app as Flatpak
build_flatpak:
stage: build
image: fedora
image: $FLATPAK_IMAGE
script:
- ci/flatpak-build.sh
artifacts:
......@@ -204,8 +219,6 @@ github:
- cp build-ubuntu/OpenTodoList-x86_64.AppImage uploads
- cp deploy-win32/OpenTodoList-Windows-32bit.exe uploads
- cp deploy-win64/OpenTodoList-Windows-64bit.exe uploads
- cp build-win32-vs/OpenTodoList-Windows-32bit-MSVC.exe uploads || echo "Skip deploying MSVC 32bit installer"
- cp build-win64-vs/OpenTodoList-Windows-64bit-MSVC.exe uploads || echo "Skip deploying MSVC 64bit installer"
- cp build-android-*/*-aligned.apk uploads
- cp build-macos/app/OpenTodoList.dmg uploads
- ./ci/github-upload.py mhoeher opentodolist $CI_COMMIT_REF_NAME $GITHUB_ACCESS_TOKEN ./uploads/*
......@@ -220,8 +233,17 @@ pages:
script:
- mkdir public
- cp -r fp-repo public
- cp build-ubuntu/OpenTodoList-x86_64.AppImage public
- cp deploy-win32/OpenTodoList-Windows-32bit.exe public
- cp deploy-win64/OpenTodoList-Windows-64bit.exe public
- cp build-android-*/*-aligned.apk public
- cp build-macos/app/OpenTodoList.dmg public
- dnf install -y --nogpgcheck git
- git describe --tags > public/version.txt
- cd public
- sha256sum * > sha256sums.txt
artifacts:
paths:
- public
#only:
#- master
only:
- master
FROM fedora
RUN \
dnf install -y --nogpgcheck \
flatpak \
flatpak-builder \
libappstream-glib \
&& \
\
flatpak remote-add \
--if-not-exists \
flathub https://flathub.org/repo/flathub.flatpakrepo \
&& \
\
flatpak install -y flathub org.kde.Platform//5.12 \
&& \
\
flatpak install -y flathub org.kde.Sdk//5.12
IMAGE ?= registry.gitlab.com/rpdev/opentodolist:flatpak
help:
@echo "Targets:"
@echo " build - Build the image."
@echo " publish - Upload the image to GitLab."
build:
buildah bud --pull -t ${IMAGE} .
publish:
buildah push docker://${IMAGE}
login:
podman login registry.gitlab.com
......@@ -3,10 +3,6 @@
set -e
if [ -n "$CI" ]; then
dnf install -y --nogpgcheck \
flatpak \
flatpak-builder \
libappstream-glib
echo "$FLATPAK_SIGNING_KEY" > flatpak-signing-key.asc
gpg2 --import ./flatpak-signing-key.asc
rm flatpak-signing-key.asc
......@@ -14,12 +10,6 @@ fi
appstream-util validate-relax net.rpdev.OpenTodoList.appdata.xml
flatpak remote-add \
--if-not-exists \
flathub https://flathub.org/repo/flathub.flatpakrepo
flatpak install -y flathub org.kde.Platform//5.12
flatpak install -y flathub org.kde.Sdk//5.12
mkdir -p fp-app fp-repo
flatpak-builder \
--ccache \
......
[Flatpak Ref]
Name=net.rpdev.OpenTodoList
Branch=master
Title=net.rpdev.OpenTodoList from Continuous Integration
Url=https://rpdev.gitlab.io/opentodolist/fp-repo/
RuntimeRepo=https://flathub.org/repo/flathub.flatpakrepo
IsRuntime=false
GPGKey=LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tCgptUUlOQkZ3L2R4Y0JFQUNod1dXWWhnY3ZBb1UrMTk0aWIxSFlkbXp6OG9ZZmIraU5zdjNqVGx6R2g2dGVSRFRrCi94Q1RrcTNqalFCbUJSdmM3RVQxVzhabkIzL21DUmhFVWhoWU9FMGJkODdsa1hBZnRDbjE4MTNYMVppd0MwcWwKQkRXaVZPQ1hYYzl3TkFDc1hDVUFqTy9sQ01iM1JqS0prR0hPTjE2V2tBaUtCUkVZRnNUSW5VZ1kxM2NvMVVGTwphVlZRT05zQnZLVndDc1VRampJTUNxVGszK0o4RjZES3pDWW1teWFDcDJ6eGQ1WE1VcmtJeFUvendGVE9la0QvCmhEWDFnRHBTQUJZOTNCSENTM0dCSVc0dmN6akFtSEl0Zm9RYzRuQ29HSXc4bTI3bmFGOXkxTE5oVTZJNmE2U3EKU3V1bU9qYVo5QTNKb2ROSDdiaDI2cE8rMW1TTVdvemdKMmt1OW9qNm9uVWZwMWdpVTRvRXVJM3cva3BYc2lmSQoyR1A4YzdoaXI1WnhCeUxDR1dNK0NtdWFXR09lblBZZTZRKzhsRjZtMlBITDdaalNBbEo2MGlWTW5nK1Y5RTJKCm80MnlmbmhHSzVqV0M0ai82SG1RVjdISTlBSDVqaS90b1owb08zaFg0WC9ZMm15YVpuWTJoN1huWUZUY1ByQ1AKbGRRNjVLOWQ0SlZwcnRVOXNUZWQ3OWUrZU5iNHptUzJBMjN3WjRKMnFURnR1OUZFdXdzWVVYNFN5WjBWejMybwovcEJIQTgyQlhSY1R5aXZqb0JUL0NnZllnaVE3eU5BTjhXbFJ2MFltU1o3TGpvdUZPMEZ5VUFSMytlWitQNzF1CkVRR041aDVNcWVFaitqdUh0S0l0QnRoL1grcEdsa09rbkZEZktMaG8wL00zMXJOS1g2c2t0citSQlFBUkFRQUIKdEQ5TllYSjBhVzRnU0c5bGFHVnlJQ2hQY0dWdVZHOWtiMHhwYzNRZ1JteGhkSEJoYXlCVGFXZHVhVzVuS1NBOApiV0Z5ZEdsdVFISndaR1YyTG01bGRENkpBazRFRXdFSUFEZ1dJUVIvRWhRNzl5R25iRk9nS0tvOVcyTlZ3VDBZCnF3VUNYRDkzRndJYkF3VUxDUWdIQWdZVkNna0lDd0lFRmdJREFRSWVBUUlYZ0FBS0NSQTlXMk5Wd1QwWXF6TkQKRC85Uk9rc0tCZGI1ekdNV29ZNmJtQ3F6Zk1OVnJaMzR1cVgxdUQvTXhZVVhFaHhGeHU3b2gwcVJYOTJLR0NEVwo4NlRzRkRXUkdTQ3R5Z1U1Ymsra0dYNzRWWjZSaFI1Z0hrMFFrcjc3SmtZa2xtUnJRV1E3Ni9MNENqS29OMk1YCjBadHYxbVJwK0RuRlFmRWNGWXV6WXJ6S3hWc2FpTlFLVnUrWXg5QldUdHAyV1R3UUFYelN4WWhiZE0wMXNkWmIKbnFLbzJNai9iNmV0NFJpNWlIcTdBTmo2ZldZWVVoUUpqRWR3dmUwSTB5TVQ3T1JXT1Bqek1INmxtS0JMZzFKdwpsNS9zdEVxQnpOU2RsQ2xkQmpIVXdOQ1dJQXhLWjRiV0txWERqU1RMNy9RWTVoNEVPd29BeDNNMnJZVXdGUk8vCk1WQkxYVWN2clVGN3oxbHI0Vmp4dkNOYS8yd3VVRFpPMmV5OVdrRDIxeVEwOWVPVUFkQy8yZXFmaEswMGdhaTIKcWpHcE5lVDNDc1ptR253Y0hwWS9iUXZoRExSRHREQm9xYTMwR0s1ejdiUlZCUTRWdlBxVWsySlhhSjVSZk1iSApoMEpkYi9nV1lXenNVZUlHYm1tVS9ZQ0YzNzdaVXBuT2pMYzZ0NFFVS2hHdHlyU0FSKzFKRDIxbk0wVlFURG5pCmZIbUU1RkZ1c2RHMXBjWjh2K2FwMUViZThpbmp6eURaN21ZT2ZzWGpSNnRQa3o3VUxJZ3VDSnlIelBYT1ZFeEIKd1RmVDF5N3Z5dFZvZG9LN3E0eDR1UG1nNGZ3Y3l4RnFNbHh0c0UxWHlOeUdrbmhOdVpEV3pQWjc4ejZnd0hPWQpnNkFQUTlpK0QxOTZ6Qm5ITzJadk9WTHdNMFo0M2JuL0FCQWp0TUZYaGc3dGpya0NEUVJjUDNjWEFSQUFwbDFXCnZ5UjI3NXZHbFlBVkh1dnV2eGJEclBSY0twYTR0cHBNQjNoaUVRZFF4Z08ya3VHeHMrMDlGT0FxTFlBaE9PeFEKQ2xYWGxZS2hRY1RyMzl5QWc1NzE5a1VYWlpORm9ZSWlUWlB5TlpvN3hiaUZobDJ6cWtZM3N1NElxOEI0dkVTQwovWEQ5bW9UelVsVHpuM2JOQVUyT2xmMjdZQ3ZFNlhoWjA2cFBSalFOUVJOSDVwNitTR2N3VXphS1c2NDM1TnpKCnpvUkM1TVNtTHVyMUVyVTVrMzhac3QxZVhMOE9yeituYk1UMDd2L3RnMENwbkZidy8vTGJDR0VjVXpnbm9pKzYKVnMxc1dSdTVVdVVnUEtSMzlpZUthVmI1Tm1BclNNYWVvTkdaQWgxMldHK2ZGVlU2Yy9nOFljY3Rid1NhbmVpcwpOeTU0NklYNE04Q0xVTEVrT2F0cERqR1NlbDNPek5kN2pmTXozd2svMFpoa0Erd1Eram1IbnhnK3Y2UDJvR3g1CnE1aHdmOEROWEk0SUZqbHY3STlRMU9mMERVcUpzOGYxdFloL0tsRHYxdWVId2dORnhoRFI3WW5YYW5vTHpFbEYKUXdSYyt5bTFrQzFqcTdJQmFIY3gxeHZqa1ArWG5MWnB5YTZKbUtmKzREdnR4WlNlUXpEYnBpNk9EV3FnN2s1WApSYVNUU3JCQ3FEdlNRbTJhdUNYc0cvOHFoSXdZYVdYR2VGN29xcmduVGZsMEh2OS9HNU0zaW9vb0l1c1ppY1VyCmtjVFQ0blkzdFlsMkROZG9iT01FaWRSN1NHdDRaZHAzZHR2S3R0Nks5Y2RQa3QwSSszLzBhU1Fhc1orQm5uNlkKN1NldERjSUNvdDNqS0l1L1dkamNOU2FGSU5IL1Y0bXJmR3pKNk0wQUVRRUFBWWtDTmdRWUFRZ0FJQlloQkg4UwpGRHYzSWFkc1U2QW9xajFiWTFYQlBSaXJCUUpjUDNjWEFoc01BQW9KRUQxYlkxWEJQUmlyODVvUC8xdTh5Mzh3CmdFSTRFMkx6UHBNSHl2NzAxWTh1djk2VERTWkVDNmM4ejJ1Q08yWFhZUkxrR2ExQVl5Q1k3d3lRTFo0Q3JIWUcKeEtQUzdsR1M5Yys1bGdkQjlMRU9McDY0ZHNSYWdGUmpuSEZjS1c1RVIwVFlkUUk1NC8rSjA4VnNtYmpocHo0RgpNcWpsZVFUamNYMjNLVzRPTzNxNC9ZMklyWUJQTFJKZkJ3NzAvcjFTakJBU2V6TGtoMWJOY0l5Uk5pUTFoMENRCnoxQm9IUXVkeUVTMHQ2ZExMWXd3N2p0ZEZ2TjM1bkszajMreFhRTFR2dGlROHBLZmtzRWJQWVVNdEZHUDZ6UUEKc2R2aFFtVzJuMDZGVXdZc085eGMreDNwTHN5dmRqcG5lUERXdnJzMitlTURvdEVXYjBlaHhpbkgySGtnTjl5cwoyMklHekNLV2dzQzdSNWltVDI3R2tZaDhuNmlhY0FLV1lZT094YzE4Y0pXVVJXUloyM05LN2hESlljdWo5ZjZLCjA3UmpxbnNsMTF5cWJrd2Y4Z0EvWnN1MGtjVTJ6SlJuTGpzWW5qNExjVjcrbVFwTU1kYUlpYWpkc2JKcnJTS3cKdGpZUFVkaFBWQWpmb01HTWlTVE1iRlVOMmg2S2oyNUtqUlZHdmtocnhDK3VKblZsODNQNDRQa0FxNEtWU1NFbwovRllLVUFia3dpYkhkVUl0cGF4d2k4VzZQN0NHYmwwaHFoNVY0SERESExZYVcrc1N5bWlxU0hkSWNzd3I4QnozClFjU3o3alRRVWd6Wk8xTUplYy9EaThKbnNuMnVrN2NQdk9ITVFDMlVkOTMvMmNhRDJhN1JTTnFwSGNNUHVZbFcKOHNMQXNpb3N6aTJVUGNwa0c1eTlqekNQbmpZa2w2blF2aDc1Cj1IVTVUCi0tLS0tRU5EIFBHUCBQVUJMSUMgS0VZIEJMT0NLLS0tLS0K
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment