d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-21 18:50:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

try cross-platform builds on amd64 docker runners

Browse source
This commit is contained in:
Nicolas Werner 2024-01-06 17:14:14 +01:00
parent 45cc7ab6f7
commit 4540633723
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.gitlab-ci.yml
View file

@ -289,15 +289,20 @@ codesign-macos:
build-flatpak: build-flatpak:
stage: build 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' #image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master'
tags: tags:
- docker-${ARCH} - docker-amd64
parallel: parallel:
matrix: matrix:
- ARCH: amd64 - ARCH: amd64
AARCH: x86_64
JOBS: 0 JOBS: 0
- ARCH: arm64 - ARCH: arm64
AARCH: aarch64
JOBS: 3 JOBS: 3
before_script: before_script:
- apt-get update && apt-get -y install flatpak-builder git python3 curl python3-aiohttp python3-tenacity gir1.2-ostree-1.0 - 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) - export VERSION=$(git describe)
- mkdir -p build-flatpak - mkdir -p build-flatpak
- cd 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-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 build-bundle repo nheko-${ARCH}.flatpak im.nheko.Nheko ${CI_COMMIT_REF_NAME//\//_} - flatpak --arch=${AARCH} build-bundle repo nheko-${ARCH}.flatpak im.nheko.Nheko ${CI_COMMIT_REF_NAME//\//_}
after_script: after_script:
- bash ./.ci/upload-nightly-gitlab.sh build-flatpak/nheko-${ARCH}.flatpak - bash ./.ci/upload-nightly-gitlab.sh build-flatpak/nheko-${ARCH}.flatpak
- (cd ./scripts && ./upload-to-flatpak-repo.sh ../build-flatpak/repo) || exit_code=$? - (cd ./scripts && ./upload-to-flatpak-repo.sh ../build-flatpak/repo) || exit_code=$?
@ -325,6 +330,7 @@ build-flatpak:
paths: ['build-flatpak/nheko-${ARCH}.flatpak'] paths: ['build-flatpak/nheko-${ARCH}.flatpak']
name: flatpak-${CI_COMMIT_REF_NAME}-${VERSION}-${ARCH} name: flatpak-${CI_COMMIT_REF_NAME}-${VERSION}-${ARCH}
# disabled until I find a qt6.5 ppa for Ubuntu # disabled until I find a qt6.5 ppa for Ubuntu
.appimage-amd64: .appimage-amd64:
stage: build stage: build

6
im.nheko.Nheko.yaml
View file

@ -195,15 +195,15 @@ modules:
- -Dgst-plugins-base:gl_winsys=x11,wayland - -Dgst-plugins-base:gl_winsys=x11,wayland
- -Dgst-plugins-base:x11=enabled - -Dgst-plugins-base:x11=enabled
- -Dgst-plugins-base:xshm=enabled - -Dgst-plugins-base:xshm=enabled
- buildsystem: qmake - buildsystem: cmake
name: qt-jdenticon name: qt-jdenticon
no-make-install: true no-make-install: true
build-commands: build-commands:
- mkdir -p /app/bin/ - mkdir -p /app/bin/
- cp libqtjdenticon.so /app/bin/ - cp libqtjdenticon.so /app/bin/
sources: sources:
- commit: 0346c228f1d544581dfd72a4dceb84f8714570dd - commit: 1e7013d64fd081d76e4ce69f2693129c817fd8f1
tag: v0.3.0 #tag: v0.3.0
type: git type: git
url: https://github.com/Nheko-Reborn/qt-jdenticon.git url: https://github.com/Nheko-Reborn/qt-jdenticon.git
- buildsystem: meson - buildsystem: meson