summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Steiner <jimmac@gmail.com>2021-04-09 17:16:05 +0000
committerJakub Steiner <jimmac@gmail.com>2021-04-09 17:16:05 +0000
commitec1a2a36eee9462d30a2d6d5387d77a3dc40f4e0 (patch)
treed6e4b8c57387a69f73e1e787ff6dc55269b85858
parent2ec6da7553017992ea9d12c8697c21785168b705 (diff)
parent71be102db0523a53942a16c3ded9e2cb60ecdbe4 (diff)
downloadgnome-backgrounds-ec1a2a36eee9462d30a2d6d5387d77a3dc40f4e0.tar.gz
Merge branch 'alatiera/fix-build' into 'master'
fix build and add CI See merge request GNOME/gnome-backgrounds!6
-rw-r--r--.gitlab-ci.yml13
-rw-r--r--backgrounds/meson.build4
2 files changed, 15 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..24d7354
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,13 @@
+image: registry.fedoraproject.org/fedora:latest
+
+variables:
+ DEPENDENCIES: meson ninja-build gettext
+ GIT_DEPTH: "5"
+
+build:
+ before_script:
+ - dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES
+ script:
+ - meson _build
+ - ninja -C _build
+ - DESTDIR="$(pwd)/destdir" ninja -C _build install
diff --git a/backgrounds/meson.build b/backgrounds/meson.build
index fa83a4a..695a668 100644
--- a/backgrounds/meson.build
+++ b/backgrounds/meson.build
@@ -13,9 +13,9 @@ backgrounds = [
'adwaita-morning.png',
'adwaita-night.png',
'ColdWarm.jpg',
- 'DepthLava.png',
+ 'Disco.jpg',
+ 'DiscoHex.jpg',
'IceCrystals.jpg',
- 'Lava.jpg',
'Leaf.jpg',
'LightBulb.jpg',
'Loveles.jpg',