ci: Funnel package list to be built correctly

It was on one hand using multi-line piping (`|`) and trying to
compensate with \ to escape multiple lines, this lead to:

  No match for argument: \

Also, the quoting around pkgconfig() arguments would lead to
double quoting at the shell level, thus:

  No match for argument: 'pkgconfig(gio-2.0)'

Fix both by using multi-line-turns-single-line piping (`>`)
and dropping the unnecessary quotes.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1913>
This commit is contained in:
Carlos Garnacho 2021-07-14 23:16:10 +02:00 committed by Marge Bot
parent b156cabdc9
commit 37a6434a4d

View File

@ -50,10 +50,10 @@ workflow:
FDO_DISTRIBUTION_VERSION: 34
FDO_DISTRIBUTION_TAG: '2021-07-07.1'
FDO_UPSTREAM_REPO: GNOME/gnome-shell
FDO_DISTRIBUTION_PACKAGES: |
findutils mozjs78-devel nodejs npm meson \
'pkgconfig(gio-2.0)' 'pkgconfig(gio-unix-2.0)' \
'pkgconfig(gnome-autoar-0)' 'pkgconfig(json-glib-1.0)'
FDO_DISTRIBUTION_PACKAGES: >
findutils mozjs78-devel nodejs npm meson
pkgconfig(gio-2.0) pkgconfig(gio-unix-2.0)
pkgconfig(gnome-autoar-0) pkgconfig(json-glib-1.0)
FDO_DISTRIBUTION_EXEC: |
# For static analysis with eslint
npm install -g eslint &&