diff options
| author | Antenore Gatta <antenore@simbiosi.org> | 2018-07-06 17:15:13 +0300 |
|---|---|---|
| committer | Antenore Gatta <antenore@simbiosi.org> | 2018-07-06 17:15:13 +0300 |
| commit | 22a92cc260247a8c859d41734a6d7cfa747caf0b (patch) | |
| tree | d89db92472ce0125facb2f5540be331ca1db3877 /.gitlab-ci.yml | |
| parent | 4b08f3371991c09aab0025c1ea5d57a8def0baca (diff) | |
Manually set manifest path
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 08a45d036..dc2185a6d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,7 +55,7 @@ ubuntu:devel: - cmake -B$BUILD_FOLDER -H. $CMAKE_BUILD_OPTIONS - make VERBOSE=1 -C $BUILD_FOLDER only: - - branches + # - branches - tags - web - schedules @@ -67,6 +67,7 @@ flatpak:test: CMAKE_ARGS: "-G Ninja -DCMAKE_INSTALL_PREFIX:PATH=/app -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DWITH_MANPAGES:BOOL=OFF -DWITH_TELEPATHY:BOOL=OFF" + MANIFEST_PATH: "flatpak/org.remmina.Remmina.json" before_script: - apt-get update -qq - apt-get install -y -qq software-properties-common @@ -76,11 +77,11 @@ flatpak:test: - apt-get install -y -qq flatpak-builder flatpak build-essential git-core - flatpak --user remote-add --if-not-exists flathub $FLATHUB_REPO script: - - flatpak-builder --install-deps-from=flathub --stop-at=remmina app org.remmina.Remmina.json --ccache + - flatpak-builder --install-deps-from=flathub --stop-at=remmina app/ $MANIFEST_PATH --ccache - mkdir -p _build - flatpak build --build-dir="${PWD}/_build" app cmake $CMAKE_ARGS ../.. - flatpak build app ninja -v -C _build install - - flatpak-builder --finish-only --repo=repo app org.remmina.Remmina.json + - flatpak-builder --finish-only --repo=repo app $MANIFEST_PATH - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${FLATHUB_REPO} ${DBUS_ID} artifacts: paths: @@ -90,7 +91,7 @@ flatpak:test: paths: - .flatpak-builder/cache only: - - branches + # - branches - tags - web - schedules |