diff options
author | Marco Melorio <marco.melorio@protonmail.com> | 2022-09-07 12:19:32 +0200 |
---|---|---|
committer | Felipe Borges <felipeborges@gnome.org> | 2022-11-24 13:20:13 +0100 |
commit | 7ad4c2d06548d0824880832d6f04ee2daf615427 (patch) | |
tree | 85b5d2cb65ecef8dcf97dbf55eb35b27fc80cc0e /.gitlab-ci.yml | |
parent | b4add5440798e9d3a21e26d06a8bee2e245bd3bf (diff) | |
download | gnome-control-center-7ad4c2d06548d0824880832d6f04ee2daf615427.tar.gz |
ci: Remove unneeded copying in the flatpak build
This was missing out the `polkit-autogen` file, so the flatpak build was
failing because of that. Fix this by removing the copying phase and use
the correct manifest path directly instead.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 974e75431..14ca474cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -315,9 +315,7 @@ flatpak: OLD_APPID: "org.gnome.Settings" APPID: "org.gnome.SettingsDevel" BUNDLE: "org.gnome.SettingsDevel.flatpak" - MANIFEST_PATH: "org.gnome.Settings.json" - PATCHES: "build-aux/flatpak/*.patch" - PROJECT_FILE: "build-aux/flatpak/org.gnome.Settings.json" + MANIFEST_PATH: "build-aux/flatpak/org.gnome.Settings.json" PROJECT_ID: "org.gnome.Settings" PROJECT_NAME: "gnome-control-center.git" RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo" @@ -325,10 +323,6 @@ flatpak: script: - echo "== Flatpak packaging ==" - # Move needed files to the root folder - - cp ${PATCHES} . || true - - cp ${PROJECT_FILE} ${MANIFEST_PATH} - # Make it a develoment manifest - sed -i -n "p; s/$PROJECT_NAME//p" ${MANIFEST_PATH} - > |