From b0e9ff17112817d7317d3168b4909179211973da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <frederic.danis@collabora.com>
Date: Tue, 28 Jan 2020 11:35:46 +0100
Subject: [PATCH] Use runtime from images.a.o to build app
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Frédéric Danis <frederic.danis@collabora.com>
---
.gitlab-ci.yml | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e786b83..51b564f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,7 +33,7 @@ build-runtime:
- git clone --branch apertis/${APERTIS_RELEASE} --depth 1 ${FLATDEB_PROJECT_URL}
- apertis-flatdeb/run.py --suite=${APERTIS_RELEASE} --arch=amd64 base
- apertis-flatdeb/run.py --suite=${APERTIS_RELEASE} --arch=amd64 runtimes runtimes/org.apertis.demo.yaml
- - cp -a ~/.cache/flatdeb _build/.
+ - mv ~/.cache/flatdeb _build/.
artifacts:
paths:
- _build/
@@ -57,17 +57,13 @@ upload-runtime:
build-app:
variables:
GIT_STRATEGY: clone
+ REMOTE_URL: https://images.apertis.org/test/flatpak/runtime
stage: build app
script:
- apt update
- apt install -y binutils debootstrap debos flatpak ostree pigz python3 python3-debian python3-gi python3-yaml systemd-container time flatpak-builder
- git clone --branch apertis/${APERTIS_RELEASE} --depth 1 ${FLATDEB_PROJECT_URL}
- - mkdir -p ~/.cache
- - mv _build/* ~/.cache/.
- - flatpak --user remote-add --no-gpg-verify flatdeb $HOME/.cache/flatdeb/ostree-repo/
- - flatpak remotes
- - flatpak remote-ls flatdeb
- - apertis-flatdeb/run.py --suite=${APERTIS_RELEASE} --arch=amd64 app apps/org.apertis.demo.curl.yaml
+ - apertis-flatdeb/run.py --remote-url="${REMOTE_URL}" --suite=${APERTIS_RELEASE} --arch=amd64 app apps/org.apertis.demo.curl.yaml
- rm -rf _build/flatdeb
- mv ~/.cache/flatdeb _build/.
artifacts:
--
GitLab