[gjs: 4/10] CI: Always build HEAD in Flatpak manifest



commit 554e3d7a47eb376d042264a5c2832c073c0fc3ce
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Feb 24 11:31:19 2019 -0800

    CI: Always build HEAD in Flatpak manifest
    
    The commit being built for CI will already be checked out, so if we
    specify HEAD in the manifest flatpak-builder will check out that commit
    too.
    
    The previous way of specifying this only worked for branches, not tags.

 test/org.gnome.GjsDevel.json | 2 +-
 test/test-ci.sh              | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/test/org.gnome.GjsDevel.json b/test/org.gnome.GjsDevel.json
index 9af08d08..9fb54d35 100644
--- a/test/org.gnome.GjsDevel.json
+++ b/test/org.gnome.GjsDevel.json
@@ -23,7 +23,7 @@
             "sources": [
                 {
                     "type": "git",
-                    "branch": "<<current>>",
+                    "branch": "HEAD",
                     "path": "."
                 }
             ]
diff --git a/test/test-ci.sh b/test/test-ci.sh
index 4b6e48d9..554b8569 100755
--- a/test/test-ci.sh
+++ b/test/test-ci.sh
@@ -302,7 +302,6 @@ elif [[ $1 == "FLATPAK" ]]; then
     # Ajust to the current branch
     sed -i "s,<<ID>>,$APPID,g" ${MANIFEST_PATH}
     sed -i "s,<<master>>,master,g" ${MANIFEST_PATH}
-    sed -i "s,<<current>>,origin/$CI_COMMIT_REF_NAME,g" ${MANIFEST_PATH}
 
     flatpak-builder --bundle-sources --repo=devel build ${MANIFEST_PATH}
     flatpak build-bundle devel ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${APPID}


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]