Commit e86788f1 authored by Philip Chimento's avatar Philip Chimento

CI: Adjust flatpak-builder configuration

No need to make these substitutions, they are always the same.
parent 554e3d7a
......@@ -629,9 +629,8 @@ flatpak:
variables:
TASK_ID: "flatpak packaging"
CODECHECK: "FLATPAK"
APPID: "org.gnome.GjsDevel"
BUNDLE: "org.gnome.GjsDevel.flatpak"
MANIFEST_PATH: "org.gnome.GjsDevel.json"
MANIFEST: org.gnome.GjsDevel.json
RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo"
environment:
......
{
"id": "<<ID>>",
"branch": "<<master>>",
"id": "org.gnome.GjsDevel",
"branch": "master",
"runtime": "org.gnome.Platform",
"runtime-version": "master",
"sdk": "org.gnome.Sdk",
......@@ -18,7 +18,6 @@
"modules": [
{
"name": "gjs",
"buildsystem": "autotools",
"builddir": true,
"sources": [
{
......
......@@ -297,14 +297,11 @@ elif [[ $1 == "FLATPAK" ]]; then
do_Print_Labels 'Flatpak packaging'
# Move the manifest file to the root folder
cp test/*.json .
cp "test/$MANIFEST" .
# Ajust to the current branch
sed -i "s,<<ID>>,$APPID,g" ${MANIFEST_PATH}
sed -i "s,<<master>>,master,g" ${MANIFEST_PATH}
flatpak-builder --bundle-sources --repo=devel build ${MANIFEST_PATH}
flatpak build-bundle devel ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${APPID}
flatpak-builder --version
flatpak-builder --bundle-sources --repo=devel build "$MANIFEST"
flatpak build-bundle devel ${BUNDLE} --runtime-repo=${RUNTIME_REPO} org.gnome.GjsDevel
fi
# Releases stuff and finishes
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment