Browse Source

ci: Fix nightly build

Resources where compiled for stable version
merge-requests/1327/merge
Kévin Commaille 4 years ago
parent
commit
6ade43833d
No known key found for this signature in database
GPG Key ID: DD507DAE96E8245C
  1. 2
      .gitlab-ci.yml
  2. 2
      meson.build
  3. 3
      meson_options.txt
  4. 2
      src/meson.build

2
.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}
- >

2
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 == ''

3
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".'

2
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')

Loading…
Cancel
Save