[gjs: 5/10] CI: Adjust flatpak-builder configuration

[Cosimo Cecchi <cosimoc src gnome org>]

commit e86788f1a2c40380b5c66e2220a77e35e2f815b0
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Feb 24 11:38:57 2019 -0800

    CI: Adjust flatpak-builder configuration
    
    No need to make these substitutions, they are always the same.

 .gitlab-ci.yml               |  3 +--
 test/org.gnome.GjsDevel.json |  5 ++---
 test/test-ci.sh              | 11 ++++-------
 3 files changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d2f04e5..25d625b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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:
diff --git a/test/org.gnome.GjsDevel.json b/test/org.gnome.GjsDevel.json
index 9fb54d35..292ddfd8 100644
--- a/test/org.gnome.GjsDevel.json
+++ b/test/org.gnome.GjsDevel.json
@@ -1,6 +1,6 @@
 {
-    "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": [
                 {
diff --git a/test/test-ci.sh b/test/test-ci.sh
index 554b8569..3c012e19 100755
--- a/test/test-ci.sh
+++ b/test/test-ci.sh
@@ -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