lol

.ci-make.sh

@@ -8,10 +8,6 @@ CI_VERIFY_RETRY_COUNT=30 # How many times to retry before giving up if the pipel
 case "$1" in
 	"submodule-build")
 		cd "$2"
-		LDFLAGS="$LDFLAGS -X \"code.gitea.io/gitea/modules/setting.StaticRootPath=/usr/share/forgejo\""
-		LDFLAGS="$LDFLAGS -X \"code.gitea.io/gitea/modules/setting.AppWorkPath=/var/lib/forgejo\""
-		LDFLAGS="$LDFLAGS -X \"code.gitea.io/gitea/modules/setting.CustomConf=/etc/forgejo/app.ini\""
-		export LDFLAGS
 		make build
 		EXIT_STATUS=$?
 		mv gitea ../"$3"
@@ -149,14 +145,11 @@ case "$1" in
 		mkdir deb/forgejo-sqlite-bin
 		mv forgejo-bin deb/forgejo-bin/forgejo
 		mv forgejo-sqlite-bin deb/forgejo-sqlite-bin/forgejo
-		cp -r forgejo/public deb/public
-		cp -r forgejo/templates deb/templates
-		cp -r forgejo/options deb/options
 		if [ -x forgejo-bin-dl ] ; then
 			mkdir deb/forgejo-bin-dl
 			mv forgejo-bin-dl deb/forgejo-bin-dl/forgejo
 			mv deb/.forgejo-bin.install deb/debian/forgejo-bin.install
-			ln -s forgejo-common.preinst deb/debian/forgejo-bin.preinst
+			ln -s forgejo.preinst deb/debian/forgejo-bin.preinst
 			ln -s forgejo.postinst deb/debian/forgejo-bin.postinst
 			ln -s forgejo.prerm deb/debian/forgejo-bin.prerm
 			echo >> deb/debian/control
@@ -199,27 +192,13 @@ case "$1" in
 	"install-run-test")
 		export DEBIAN_FRONTEND=noninteractive
 		apt update
-		if [ "$2" = "${2#"./forgejo-bin_"}" ] ; then
+		apt install -y ./"$2"
-			APT_FORGEJO_COMMON_RESOLVE="$(ls -1 ./forgejo-common_*_all.deb)"
+		[ -f "/etc/default/forgejo" ] && . /etc/default/forgejo
-			if [ -f "$APT_FORGEJO_COMMON_RESOLVE" ] ; then
+		[ -z "$FORGEJO_HOME" ] && FORGEJO_HOME=/var/lib/forgejo
-				APT_FORGEJO_COMMON="./$APT_FORGEJO_COMMON_RESOLVE"
+		[ -z "$FORGEJO_USER" ] && FORGEJO_USER=forgejo
-			else
+		sudo -u $FORGEJO_USER USER=$FORGEJO_USER \
-				echo "ERR! Unable to find the necessary forgejo-common package!"
+			HOME=$FORGEJO_HOME FORGEJO_WORK_DIR=$FORGEJO_HOME \
-				exit 96
+			forgejo web -q --config /etc/forgejo/app.ini &
-			fi
-		fi
-		apt install -y $APT_FORGEJO_COMMON ./"$2"
-		if [ -f "/etc/default/forgejo" ] || [ "$2" != "${2#"./forgejo-bin_"}" ] ; then
-			[ -f "/etc/default/forgejo" ] && . /etc/default/forgejo
-			[ -z "$FORGEJO_HOME" ] && FORGEJO_HOME=/var/lib/forgejo
-			[ -z "$FORGEJO_USER" ] && FORGEJO_USER=forgejo
-			sudo -u $FORGEJO_USER USER=$FORGEJO_USER \
-				HOME=$FORGEJO_HOME FORGEJO_WORK_DIR=$FORGEJO_HOME \
-				forgejo web -q --config /etc/forgejo/app.ini &
-		else
-			echo "No env setup! Run testing defaults using hardcoded vars..."
-			sudo -u forgejo USER=forgejo forgejo web -q &
-		fi
 		sleep 10
 		curl http://localhost:3000/ | grep -A 4 "Powered by Forgejo"
 		exit $?

.forgejo/workflows/forgejo-deb.yml

@@ -49,6 +49,8 @@ jobs:
 
       - name: Build Forgejo for arm64
         run: ./.ci-make.sh submodule-build forgejo forgejo-bin
+        env:
+          TAGS: bindata
 
       - run: ./.ci-make.sh package-prep
       - run: ./.ci-make.sh package-build-deps

deb/.forgejo-bin.control

@@ -1,8 +1,8 @@
 Package: forgejo-bin
 Architecture: arm64
 Priority: optional
-Provides: forgejo, gitea
+Provides: forgejo,gitea
 Depends: adduser (>= 3.11), git
-Conflicts: forgejo, forgejo-sqlite, forgejo-common
+Conflicts: forgejo,forgejo-sqlite,forgejo-common
 Description: Forgejo: Beyond Coding. We Forge. (binary)
  The official Forgejo release binary in a Debian package

deb/debian/NEWS

@@ -1,4 +1,4 @@
-forgejo (7.0.1-2) unstable; urgency=medium
+forgejo (7.0.1-1) unstable; urgency=medium
 
   WARNING: Forgejo will be upgraded to v7.0.1 LTS
 

deb/debian/changelog

@@ -1,11 +1,3 @@
-forgejo (7.0.5-1) unstable; urgency=medium
-
-  * Forgejo version 7.0.5
-  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#7-0-5
-  * Split `forgejo-common` package for extra data
-
- -- crystal <crystal@noreply.codeberg.org>  Sun, 07 July 2024 17:22:00 +0000
-
 forgejo (7.0.4-1) unstable; urgency=medium
 
   * Forgejo version 7.0.4
@@ -31,7 +23,6 @@ forgejo (7.0.1-1) unstable; urgency=medium
 
   * Forgejo version 7.0.1
   * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#7-0-1
-  * Forgejo Actions based build process
 
  -- crystal <crystal@noreply.codeberg.org>  Sat, 27 Apr 2024 15:35:00 +0000
 

deb/debian/control

@@ -8,15 +8,7 @@ Package: forgejo
 Architecture: arm64
 Priority: optional
 Provides: gitea
-Depends: forgejo-common (= ${source:Version}), adduser (>= 3.11), git
+Depends: adduser (>= 3.11),git
-Conflicts: forgejo-sqlite, forgejo-bin
+Conflicts: forgejo-sqlite,forgejo-bin
 Description: Forgejo: Beyond Coding. We Forge.
  Forgejo with bindata ONLY - Use this package for MySQL or PostgreSQL setup
-
-Package: forgejo-common
-Architecture: all
-Priority: optional
-Depends: forgejo | forgejo-sqlite (= ${source:Version})
-Conflicts: forgejo-bin
-Description: Common files for Forgejo
- Common data used for all Forgejo packages and architectures.

deb/debian/forgejo-common.install

@@ -1,5 +0,0 @@
-public/ /usr/share/forgejo
-templates/ /usr/share/forgejo
-options/ /usr/share/forgejo
-forgejo.service /usr/lib/systemd/system
-app.ini /etc/forgejo

deb/debian/forgejo-sqlite.install

@@ -1 +1,3 @@
 forgejo-sqlite-bin/forgejo /usr/bin
+forgejo.service /usr/lib/systemd/system
+app.ini /etc/forgejo

deb/debian/forgejo-sqlite.preinst

@@ -0,0 +1 @@
+forgejo.preinst

deb/debian/forgejo.install

@@ -1 +1,3 @@
 forgejo-bin/forgejo /usr/bin
+forgejo.service /usr/lib/systemd/system
+app.ini /etc/forgejo

forgejo

@@ -1 +1 @@
-Subproject commit 65a89ce6be62018ea50cb01c080072973ce87efb
+Subproject commit 5c59a1347a5fbf183eef22fe46805b4d1a8606f3