fix usage of new repo utils, refs #13

Signed-off-by: morph027 <stefan.heitmueller@gmx.com>

.gitlab-ci.yml

@@ -92,45 +92,15 @@ gitea-arm64-trigger:
 
 .test-install: &test-install
   stage: test
-  image: docker:stable
+  image: ubuntu:noble
-  services:
-    - docker:stable-dind
-  variables:
-    DOCKER_TLS_CERTDIR: ""
   script:
-    - docker run
+    - ./.gitlab-ci/test-install.sh
-      -d
-      --name systemd-ubuntu
-      --tmpfs /tmp
-      --tmpfs /run
-      --tmpfs /run/lock
-      -v /sys/fs/cgroup:/sys/fs/cgroup:ro
-      -v $CI_PROJECT_DIR:/src
-      -e CI_PROJECT_DIR=/src
-      -e CI_COMMIT_TAG=$CI_COMMIT_TAG
-      jrei/systemd-ubuntu:20.04
-    - docker exec -t systemd-ubuntu /bin/bash /src/.gitlab-ci/test-install.sh
 
 .test-update: &test-update
   stage: test
-  image: docker:stable
+  image: ubuntu:noble
-  services:
-    - docker:stable-dind
-  variables:
-    DOCKER_TLS_CERTDIR: ""
   script:
-    - docker run
+    - ./.gitlab-ci/test-update.sh
-      -d
-      --name systemd-ubuntu
-      --tmpfs /tmp
-      --tmpfs /run
-      --tmpfs /run/lock
-      -v /sys/fs/cgroup:/sys/fs/cgroup:ro
-      -v $CI_PROJECT_DIR:/src
-      -e CI_PROJECT_DIR=/src
-      -e CI_COMMIT_TAG=$CI_COMMIT_TAG
-      jrei/systemd-ubuntu:20.04
-    - docker exec -t systemd-ubuntu /bin/bash /src/.gitlab-ci/test-update.sh
 
 test-install-trigger:
   <<: *test-install
@@ -165,54 +135,52 @@ test-update-tag:
     untracked: true
     paths:
       - $CI_PROJECT_DIR/.repo
-    key: reprepro
+    key: repo
   stage: repo
-  image: registry.gitlab.com/packaging/reprepro-multiple-versions:latest
+  image: registry.gitlab.com/packaging/utils:latest
   script:
-    - apt-get -qq update
+    - /deb.sh gitea
-    - apt-get -qqy install curl
-    - curl -L https://gitlab.com/packaging/utils/-/raw/main/repo.sh |
-       bash -s -- gitea
 
-repo-tag:
+repo-apt-tag:
   <<: [*repo]
   needs:
     - gitea-amd64-tag
     - gitea-arm64-tag
     - test-install-tag
     - test-update-tag
-  only:
+  rules:
-    - tags
+    - if: $CI_COMMIT_TAG && $CI_PIPELINE_SOURCE != "trigger"
 
-repo-trigger:
+
+repo-apt-trigger:
   <<: [*repo]
   needs:
     - gitea-amd64-trigger
     - gitea-arm64-trigger
     - test-install-trigger
     - test-update-trigger
-  only:
+  rules:
-    - triggers
+    - if: $CI_COMMIT_TAG && $CI_PIPELINE_SOURCE == "trigger"
 
 pages:
   cache:
     untracked: true
     paths:
       - $CI_PROJECT_DIR/.repo
-    key: reprepro
+    key: repo
     policy: pull
   stage: pages
   image: ubuntu:focal
   needs:
-    - job: repo-tag
+    - job: repo-apt-tag
       optional: true
-    - job: repo-trigger
+    - job: repo-apt-trigger
       optional: true
   script:
     - mkdir $CI_PROJECT_DIR/public
-    - cp -r
+    - cp -rv
-        $CI_PROJECT_DIR/.repo/gpg.key
+        $CI_PROJECT_DIR/.repo/deb/gpg.key
-        $CI_PROJECT_DIR/.repo/gitea/{dists,pool}
+        $CI_PROJECT_DIR/.repo/deb/gitea/gitea/{dists,pool}
         $CI_PROJECT_DIR/public/
   artifacts:
     paths:

.gitlab-ci/init

@@ -0,0 +1,84 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          gitea
+# Required-Start:    $syslog $network
+# Required-Stop:     $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: A self-hosted Git service written in Go.
+# Description:       A self-hosted Git service written in Go.
+### END INIT INFO
+
+# Do NOT "set -e"
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
+DESC="Gitea - Git with a cup of tea"
+NAME=gitea
+SERVICEVERBOSE=yes
+PIDFILE=/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+WORKINGDIR=/var/lib/$NAME
+DAEMON=/usr/bin/$NAME
+DAEMON_ARGS="web -c /etc/$NAME/app.ini"
+USER=gitea
+STOP_SCHEDULE="${STOP_SCHEDULE:-QUIT/5/TERM/1/KILL/5}"
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+do_start()
+{
+    GITEA_ENVS="USER=$USER GITEA_WORK_DIR=$WORKINGDIR HOME=/var/lib/$USER"
+    GITEA_EXEC="$DAEMON -- $DAEMON_ARGS"
+    sh -c "start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \\
+        --background --chdir $WORKINGDIR --chuid $USER \\
+        --exec /bin/bash -- -c '/usr/bin/env $GITEA_ENVS $GITEA_EXEC'"
+}
+
+do_stop()
+{
+    start-stop-daemon --stop --quiet --retry=$STOP_SCHEDULE --pidfile $PIDFILE --name $NAME --oknodo
+    rm -f $PIDFILE
+}
+
+do_status()
+{
+    if [ -f $PIDFILE ]; then
+        if kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
+            echo "$NAME is running, PID is $(cat $PIDFILE)"
+        else
+            echo "$NAME process is dead, but pidfile exists"
+        fi
+    else
+        echo "$NAME is not running"
+    fi
+}
+
+case "$1" in
+    start)
+        echo "Starting $DESC" "$NAME"
+        do_start
+        ;;
+    stop)
+        echo "Stopping $DESC" "$NAME"
+        do_stop
+        ;;
+    status)
+        do_status
+        ;;
+    restart)
+        echo "Restarting $DESC" "$NAME"
+        do_stop
+        do_start
+        ;;
+    *)
+        echo "Usage: $SCRIPTNAME {start|stop|status|restart}" >&2
+        exit 2
+        ;;
+esac
+
+exit 0

.gitlab-ci/test-update.sh

@@ -6,7 +6,7 @@ curl -sL -o /etc/apt/trusted.gpg.d/morph027-gitea.asc https://packaging.gitlab.i
 echo "deb [arch=amd64] https://packaging.gitlab.io/gitea gitea main" > /etc/apt/sources.list.d/morph027-gitea.list
 apt-get update
 apt-get -y install gitea
-cp "/${CI_PROJECT_DIR}/.gitlab-ci/app.ini" /etc/gitea/app.ini
+install -o gitea -g gitea -m 644 "/${CI_PROJECT_DIR}/.gitlab-ci/app.ini" /etc/gitea/app.ini
 start_gitea
 curl -s localhost:3000/api/v1/version | jq -e '.version'
 apt-get -y --allow-downgrades install "${CI_PROJECT_DIR}/gitea_${VERSION}+${PATCHLEVEL}_amd64.deb"

.gitlab-ci/test.sh

@@ -6,16 +6,20 @@ VERSION=$(echo "${CI_COMMIT_TAG#*v}" | cut -d'+' -f1)
 PATCHLEVEL=$(echo "${CI_COMMIT_TAG}" | cut -d'+' -f2)
 export VERSION PATCHLEVEL
 
+if [ ! -f /etc/init.d/gitea ]; then
+    cp -v "${CI_PROJECT_DIR}"/.gitlab-ci/init /etc/init.d/gitea
+fi
+
 start_gitea() {
-  systemctl start gitea
+  /etc/init.d/gitea start
   sleep 10
-  if ! systemctl is-active gitea; then
+  if ! /etc/init.d/gitea status | grep 'gitea is running'; then
-    journalctl -lu gitea --no-pager
+    cat /var/lib/gitea/log/gitea.log
   fi
 }
 
 restart_gitea() {
-  systemctl stop gitea
+  /etc/init.d/gitea stop
   start_gitea
 }