From 45406337236c0dffbd2255d2e41228f5eaae7388 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Sat, 6 Jan 2024 17:14:14 +0100
Subject: [PATCH] try cross-platform builds on amd64 docker runners

---
 .gitlab-ci.yml      | 14 ++++++++++----
 im.nheko.Nheko.yaml |  6 +++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 501976dc..b64e1d53 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -289,15 +289,20 @@ codesign-macos:
 
 build-flatpak:
   stage: build
-  image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/ubuntu:latest
+  image:
+    name: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/ubuntu:latest
+    #docker:
+    #  platform: ${ARCH}
   #image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master'
   tags: 
-    - docker-${ARCH}
+    - docker-amd64
   parallel:
     matrix:
       - ARCH: amd64
+        AARCH: x86_64
         JOBS: 0
       - ARCH: arm64
+        AARCH: aarch64
         JOBS: 3
   before_script:
     - apt-get update && apt-get -y install flatpak-builder git python3 curl python3-aiohttp python3-tenacity gir1.2-ostree-1.0
@@ -308,8 +313,8 @@ build-flatpak:
     - export VERSION=$(git describe)
     - mkdir -p build-flatpak
     - cd build-flatpak
-    - flatpak-builder --install-deps-from=flathub --user --disable-rofiles-fuse --ccache --repo=repo --default-branch=${CI_COMMIT_REF_NAME//\//_} --subject="Build of Nheko ${VERSION} `date` for ${ARCH}" app ../im.nheko.Nheko.yaml --jobs=$JOBS
-    - flatpak build-bundle repo nheko-${ARCH}.flatpak im.nheko.Nheko ${CI_COMMIT_REF_NAME//\//_}
+    - flatpak-builder --arch=${AARCH} --install-deps-from=flathub --user --disable-rofiles-fuse --ccache --repo=repo --default-branch=${CI_COMMIT_REF_NAME//\//_} --subject="Build of Nheko ${VERSION} `date` for ${ARCH}" app ../im.nheko.Nheko.yaml --jobs=$JOBS
+    - flatpak --arch=${AARCH} build-bundle repo nheko-${ARCH}.flatpak im.nheko.Nheko ${CI_COMMIT_REF_NAME//\//_}
   after_script:
     - bash ./.ci/upload-nightly-gitlab.sh build-flatpak/nheko-${ARCH}.flatpak
     - (cd ./scripts && ./upload-to-flatpak-repo.sh ../build-flatpak/repo) || exit_code=$?
@@ -325,6 +330,7 @@ build-flatpak:
     paths: ['build-flatpak/nheko-${ARCH}.flatpak']
     name: flatpak-${CI_COMMIT_REF_NAME}-${VERSION}-${ARCH}
 
+
 # disabled until I find a qt6.5 ppa for Ubuntu
 .appimage-amd64:
   stage: build
diff --git a/im.nheko.Nheko.yaml b/im.nheko.Nheko.yaml
index f8da2a22..a71f2b18 100644
--- a/im.nheko.Nheko.yaml
+++ b/im.nheko.Nheko.yaml
@@ -195,15 +195,15 @@ modules:
       -  -Dgst-plugins-base:gl_winsys=x11,wayland
       -  -Dgst-plugins-base:x11=enabled
       -  -Dgst-plugins-base:xshm=enabled
-  - buildsystem: qmake
+  - buildsystem: cmake
     name: qt-jdenticon
     no-make-install: true
     build-commands:
       - mkdir -p /app/bin/
       - cp libqtjdenticon.so /app/bin/
     sources:
-      - commit: 0346c228f1d544581dfd72a4dceb84f8714570dd
-        tag: v0.3.0
+      - commit: 1e7013d64fd081d76e4ce69f2693129c817fd8f1
+        #tag: v0.3.0
         type: git
         url: https://github.com/Nheko-Reborn/qt-jdenticon.git
   - buildsystem: meson