From b350b69a70c106fdc344bb0b345a4ddf28cf2d4f Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Wed, 7 Aug 2024 23:53:30 +0200
Subject: [PATCH] patch_gitlab_runner hack: bad version copypasta + turns out
 the deb is debian-agnostic so let's use the same one for bullseye and
 bookworm

---
 image_builder       | 12 ++++++------
 patch_gitlab_runner | 30 +++++++++++++-----------------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/image_builder b/image_builder
index c69e4b7..63baa11 100755
--- a/image_builder
+++ b/image_builder
@@ -90,11 +90,11 @@ function rebuild_build_and_lint()
     $IN_CONTAINER dhclient eth0
 
     # Needed to build and access artefacts on core CI ...
-    incus file push ./gitlab-runner-$DEBIAN_VERSION-light.deb $CONTAINER/root/
+    incus file push ./gitlab-runner-light.deb $CONTAINER/root/
     $IN_CONTAINER /bin/bash -c "apt-get update"
     $IN_CONTAINER /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install ca-certificates git curl"
-    $IN_CONTAINER /bin/bash -c "dpkg -i /root/gitlab-runner-$DEBIAN_VERSION-light.deb"
-    $IN_CONTAINER /bin/bash -c "rm /root/gitlab-runner-$DEBIAN_VERSION-light.deb"
+    $IN_CONTAINER /bin/bash -c "dpkg -i /root/gitlab-runner-light.deb"
+    $IN_CONTAINER /bin/bash -c "rm /root/gitlab-runner-light.deb"
 
     # This is for
     # a) building .debs
@@ -135,11 +135,11 @@ function rebuild()
     $IN_CONTAINER dhclient eth0
 
     # Needed to build and access artefacts on core CI ...
-    incus file push ./gitlab-runner-$DEBIAN_VERSION-light.deb $CONTAINER/root/
+    incus file push ./gitlab-runner-light.deb $CONTAINER/root/
     $IN_CONTAINER /bin/bash -c "apt update"
     $IN_CONTAINER /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install ca-certificates git curl"
-    $IN_CONTAINER /bin/bash -c "dpkg -i /root/gitlab-runner-$DEBIAN_VERSION-light.deb"
-    $IN_CONTAINER /bin/bash -c "rm /root/gitlab-runner-$DEBIAN_VERSION-light.deb"
+    $IN_CONTAINER /bin/bash -c "dpkg -i /root/gitlab-runner-light.deb"
+    $IN_CONTAINER /bin/bash -c "rm /root/gitlab-runner-light.deb"
 
     local INSTALL_SCRIPT="https://raw.githubusercontent.com/YunoHost/install_script/main/$DEBIAN_VERSION"
 
diff --git a/patch_gitlab_runner b/patch_gitlab_runner
index d5ae4f4..5ea1552 100644
--- a/patch_gitlab_runner
+++ b/patch_gitlab_runner
@@ -1,21 +1,17 @@
 
-# wget -O gitlab-runner-bookworm.deb https://packages.gitlab.com/runner/gitlab-runner/debian/pool/bookworm/main/g/gitlab-runner/gitlab-runner_15.10.0_amd64.deb
-# wget -O gitlab-runner-bullseye.deb https://packages.gitlab.com/runner/gitlab-runner/debian/pool/bullseye/main/g/gitlab-runner/gitlab-runner_15.10.0_amd64.deb
+# wget -O gitlab-runner.deb https://packages.gitlab.com/runner/gitlab-runner/debian/pool/bookworm/main/g/gitlab-runner/gitlab-runner_17.2.1-1_amd64.deb
 
-for DIST in bullseye bookworm
-do
-    ar x gitlab-runner-$DIST.deb
-    bunzip2 data.tar.bz2 
-    tar --delete -f data.tar ./usr/lib
-    bunzip2 -z data.tar
+ar x gitlab-runner.deb
+bunzip2 data.tar.bz2
+tar --delete -f data.tar ./usr/lib
+bunzip2 -z data.tar
 
-    gzip -d control.tar.gz
-    tar -xf control.tar ./md5sums
-    sed -i '/lib\/gitlab-runner/d' md5sums
-    tar -uf control.tar ./md5sums 
-    rm md5sums
-    gzip control.tar
+gzip -d control.tar.gz
+tar -xf control.tar ./md5sums
+sed -i '/lib\/gitlab-runner/d' md5sums
+tar -uf control.tar ./md5sums
+rm md5sums
+gzip control.tar
 
-    ar rcv gitlab-runner-$DIST-light.deb debian-binary control.tar.gz data.tar.bz2
-    rm debian-binary control.tar.gz data.tar.bz2
-done
+ar rcv gitlab-runner-light.deb debian-binary control.tar.gz data.tar.bz2
+rm debian-binary control.tar.gz data.tar.bz2