[fractal] ci: Fix nightly build
- From: Kévin Commaille <kcommaille src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [fractal] ci: Fix nightly build
- Date: Mon, 4 Apr 2022 19:51:18 +0000 (UTC)
commit 6ade43833d2a3e2c1ea948b310d27d896b9d31a9
Author: Kévin Commaille <zecakeh tedomum fr>
Date: Mon Apr 4 21:20:35 2022 +0200
ci: Fix nightly build
Resources where compiled for stable version
.gitlab-ci.yml | 2 +-
meson.build | 2 +-
meson_options.txt | 3 ++-
src/meson.build | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 68ca31514..580cd8761 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ flatpak:
FLATPAK_MODULE: "fractal"
APP_ID: "org.gnome.Fractal.Devel"
RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
- CONFIG_OPTS: "-Dprofile=default"
+ CONFIG_OPTS: "-Dprofile=nightly"
script:
- rewrite-flatpak-manifest ${MANIFEST_PATH} ${FLATPAK_MODULE} ${CONFIG_OPTS}
- >
diff --git a/meson.build b/meson.build
index 1bcaaeac3..7bb26abba 100644
--- a/meson.build
+++ b/meson.build
@@ -47,7 +47,7 @@ iconsdir = datadir / 'icons'
podir = meson.project_source_root() / 'po'
gettext_package = meson.project_name()
-if get_option('profile') == 'development'
+if get_option('profile') == 'development' or get_option('profile') == 'nightly'
profile = 'Devel'
vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
if vcs_tag == ''
diff --git a/meson_options.txt b/meson_options.txt
index 35af6dbc1..bcc926731 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,7 +3,8 @@ option(
type: 'combo',
choices: [
'default',
- 'development'
+ 'development',
+ 'nightly',
],
value: 'default',
description: 'The build profile for Fractal. One of "default" or "development".'
diff --git a/src/meson.build b/src/meson.build
index 532dfd3eb..a95b49464 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -21,7 +21,7 @@ run_command(
cargo_options = [ '--manifest-path', meson.project_source_root() / 'Cargo.toml' ]
cargo_options += [ '--target-dir', meson.project_build_root() / 'src' ]
-if get_option('profile') == 'default'
+if get_option('profile') == 'default' or get_option('profile') == 'nightly'
cargo_options += [ '--release' ]
rust_target = 'release'
message('Building in release mode')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]