From d8c04d1c353fcac726ac47434aa7df9b43ca8c6d Mon Sep 17 00:00:00 2001
From: Sven-Hendrik Haase <svenstaro@gmail.com>
Date: Wed, 28 Oct 2020 09:21:19 +0100
Subject: [PATCH] Also commit .gitlab-ci.yml to orphaned branch

We have to do this in order to ensure that an updated .gitlab-ci.yml is actually available on every release.
---
 .gitlab-ci.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8ce65b..adc7150 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -177,11 +177,10 @@ release:
         curl -sSf --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file output/${group}.tar.xz ${PACKAGE_REGISTRY_URL}/${group}-${BUILD_VERSION}.tar.xz
         echo "Uploading ${group}.tar.xz.SHA256"
         curl -sSf --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file output/${group}.tar.xz.SHA256 ${PACKAGE_REGISTRY_URL}/${group}-${BUILD_VERSION}.tar.xz.SHA256
-        mkdir ci/${group}
-        sed "/TEMPLATE_ROOTFS_FILE/d" Dockerfile.template > ci/${group}/Dockerfile
+        sed "/TEMPLATE_ROOTFS_FILE/d" Dockerfile.template > output/Dockerfile.${group}
         package_url=$(./ci/get-public-download-for-generic-package.sh ${group}-${BUILD_VERSION}.tar.xz)
-        sed -i "s|TEMPLATE_ROOTFS_URL|${package_url}|" ci/${group}/Dockerfile
-        sed -i "s|TEMPLATE_ROOTFS_HASH|$(cat output/${group}.tar.xz.SHA256)|" ci/${group}/Dockerfile
+        sed -i "s|TEMPLATE_ROOTFS_URL|${package_url}|" output/Dockerfile.${group}
+        sed -i "s|TEMPLATE_ROOTFS_HASH|$(cat output/${group}.tar.xz.SHA256)|" output/Dockerfile.${group}
       done
     - >
       curl -sSf --request POST
@@ -190,10 +189,13 @@ release:
       --form "commit_message=Release ${BUILD_VERSION}"
       --form "actions[][action]=update"
       --form "actions[][file_path]=Dockerfile.base"
-      --form "actions[][content]=<ci/base/Dockerfile"
+      --form "actions[][content]=<output/Dockerfile.base"
       --form "actions[][action]=update"
       --form "actions[][file_path]=Dockerfile.base-devel"
-      --form "actions[][content]=<ci/base-devel/Dockerfile"
+      --form "actions[][content]=<output/Dockerfile.base-devel"
+      --form "actions[][action]=update"
+      --form "actions[][file_path]=.gitlab-ci.yml"
+      --form "actions[][content]=<.gitlab-ci.yml"
       "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/repository/commits"
     - |
       base_url=$(./ci/get-public-download-for-generic-package.sh base-${BUILD_VERSION}.tar.xz)