[gnome-build-meta/abderrahim/normalize-yaml] .gitlab-ci.yml, project.conf: normalize indentation
- From: Abderrahim Kitouni <akitouni src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/abderrahim/normalize-yaml] .gitlab-ci.yml, project.conf: normalize indentation
- Date: Fri, 7 Feb 2020 20:52:29 +0000 (UTC)
commit 39b46aa7428b03b9f6de0b12ae319cab56bbf117
Author: Abderrahim Kitouni <akitouni gnome org>
Date: Fri Feb 7 21:39:55 2020 +0100
.gitlab-ci.yml, project.conf: normalize indentation
this is the default for ruamel.yaml, with preserve_quotes=True and width=200
which are the options we're going to use in releng repo.
.gitlab-ci.yml | 6 ++---
project.conf | 82 +++++++++++++++++++++++++++++-----------------------------
2 files changed, 43 insertions(+), 45 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a3811e4..f4b44345 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,8 +78,7 @@ default:
stage: build
dependencies: [track]
script:
- - ${BST} --max-jobs $(( $(nproc) / 4 )) -o arch "${ARCH}" build core.bst flatpak-runtimes.bst
- flatpak-platform-extensions.bst platform-manifest.bst sdk-manifest.bst
+ - ${BST} --max-jobs $(( $(nproc) / 4 )) -o arch "${ARCH}" build core.bst flatpak-runtimes.bst
flatpak-platform-extensions.bst platform-manifest.bst sdk-manifest.bst
- |
# Only run this build for x86_64, instead of building it somewhere else
if [ "${ARCH}" == "x86_64" ]; then
@@ -218,8 +217,7 @@ flatpak-prepare:
stage: prepare_flatpak
dependencies: []
script:
- - flat-manager-client create $FLAT_MANAGER_SERVER $FLAT_MANAGER_REPO
- > build.txt
+ - flat-manager-client create $FLAT_MANAGER_SERVER $FLAT_MANAGER_REPO > build.txt
artifacts:
paths:
- build.txt
diff --git a/project.conf b/project.conf
index 21d4970d..7479ef91 100644
--- a/project.conf
+++ b/project.conf
@@ -64,10 +64,10 @@ aliases:
webkitgtk_org: https://webkitgtk.org/releases/
mirrors:
- - name: kernel_org
- aliases:
- ftp_gnu_org:
- - https://mirrors.kernel.org/gnu/
+- name: kernel_org
+ aliases:
+ ftp_gnu_org:
+ - https://mirrors.kernel.org/gnu/
# Some overrides to the default sandbox execution environment
#
@@ -77,22 +77,22 @@ environment:
PATH: /usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin
PKG_CONFIG_PATH: /usr/local/lib/pkgconfig:%{libdir}/pkgconfig
(?):
- - arch == "x86_64":
- CFLAGS: "%{flags_x86_64}"
- CXXFLAGS: "%{flags_x86_64}"
- LDFLAGS: "%{ldflags_defaults}"
- - arch == "i686":
- CFLAGS: "%{flags_i686}"
- CXXFLAGS: "%{flags_i686}"
- LDFLAGS: "%{ldflags_defaults}"
- - arch == "arm":
- CFLAGS: "%{flags_arm}"
- CXXFLAGS: "%{flags_arm}"
- LDFLAGS: "%{ldflags_defaults}"
- - arch == "aarch64":
- CFLAGS: "%{flags_aarch64}"
- CXXFLAGS: "%{flags_aarch64}"
- LDFLAGS: "%{ldflags_defaults}"
+ - arch == "x86_64":
+ CFLAGS: "%{flags_x86_64}"
+ CXXFLAGS: "%{flags_x86_64}"
+ LDFLAGS: "%{ldflags_defaults}"
+ - arch == "i686":
+ CFLAGS: "%{flags_i686}"
+ CXXFLAGS: "%{flags_i686}"
+ LDFLAGS: "%{ldflags_defaults}"
+ - arch == "arm":
+ CFLAGS: "%{flags_arm}"
+ CXXFLAGS: "%{flags_arm}"
+ LDFLAGS: "%{ldflags_defaults}"
+ - arch == "aarch64":
+ CFLAGS: "%{flags_aarch64}"
+ CXXFLAGS: "%{flags_aarch64}"
+ LDFLAGS: "%{ldflags_defaults}"
# Some overrides to element configuration based on type
#
@@ -115,24 +115,24 @@ elements:
install-commands:
(>):
# There's no way to get the setup.py to install this in the right place.
- - |
- if [ -d '%{install-root}/usr/lib/pkgconfig/' ]; then
- mkdir -p %{install-root}/usr/%{lib}/
- mv -f %{install-root}/usr/lib/pkgconfig/ %{install-root}/usr/%{lib}/
- fi
+ - |
+ if [ -d '%{install-root}/usr/lib/pkgconfig/' ]; then
+ mkdir -p %{install-root}/usr/%{lib}/
+ mv -f %{install-root}/usr/lib/pkgconfig/ %{install-root}/usr/%{lib}/
+ fi
meson:
variables:
meson-global: --buildtype=plain --auto-features=enabled
filter:
config:
- include-orphans: True
+ include-orphans: true
sources:
git_tag:
config:
- checkout-submodules: False
- track-tags: False
+ checkout-submodules: false
+ track-tags: false
split-rules:
devel:
@@ -149,7 +149,7 @@ split-rules:
- '%{datadir}/vala*/vapi'
- '%{datadir}/vala*/vapi/**'
vm:
- - '%{datadir}/dbus-1/**'
+ - '%{datadir}/dbus-1/**'
# Define some behavior for `bst shell`
#
@@ -158,7 +158,7 @@ shell:
# Default command for `bst shell`, we prefer bash, and disable
# parsing of profile and rc files so that the prompt BuildStream
# sets is not overwritten.
- command: [ 'bash', '--noprofile', '--norc', '-i' ]
+ command: ['bash', '--noprofile', '--norc', '-i']
# Some environment variables to inherit from the host environment
environment:
@@ -181,19 +181,19 @@ shell:
# Allow access to plausible video devices,
# declare these optional to avoid meaningless warnings
- path: '/dev/dri'
- optional: True
+ optional: true
- path: '/dev/mali'
- optional: True
+ optional: true
- path: '/dev/mali0'
- optional: True
+ optional: true
- path: '/dev/umplock'
- optional: True
+ optional: true
- path: '/dev/nvidiactl'
- optional: True
+ optional: true
- path: '/dev/nvidia0'
- optional: True
+ optional: true
- path: '/dev/nvidia-modeset'
- optional: True
+ optional: true
# Allow access to sysfs, needed for local device discovery
- '/sys'
@@ -225,10 +225,10 @@ variables:
ldflags_defaults: "-Wl,-z,relro,-z,now -Wl,--as-needed -L%{libdir}"
(?):
- - arch == "i686":
- gcc_arch: "i386"
- - arch == "arm":
- abi: "gnueabihf"
+ - arch == "i686":
+ gcc_arch: "i386"
+ - arch == "arm":
+ abi: "gnueabihf"
# This should eventually done with buildstream includes
strip-binaries: |
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]