Forgejo v7.0.0

This reverts commit 862c5f9e7e.

.ci-make.sh

@@ -103,6 +103,7 @@ case "$1" in
 		cp ./etc/systemd/system/forgejo.service.d/override.conf /etc/systemd/system/forgejo.service.d/override.conf
 		;;
 	"install-run-test")
+		export DEBIAN_FRONTEND=noninteractive
 		apt update
 		apt install -y ./"$2"
 		[ -f "/etc/default/forgejo" ] && . /etc/default/forgejo
@@ -118,11 +119,12 @@ case "$1" in
 	"install-repo-test")
 		export DEBIAN_FRONTEND=noninteractive
 		apt update -qq
+		apt install -y apt-utils apt-listchanges
 		apt install -y ./"$2"
 		apt update -qq
 		apt upgrade -y
 		apt update -qq
-		apt install "$3"
+		apt install -y "$3"
 		sudo -u forgejo USER=forgejo \
 			HOME=/var/lib/forgejo GITEA_WORK_DIR=/var/lib/forgejo \
 			forgejo web -q --config /etc/fogejo/app.ini &
@@ -149,10 +151,20 @@ case "$1" in
 		export DEBIAN_FRONTEND=noninteractive
 		apt update -qq
 		apt install -qq --no-install-recommends -y git-lfs
-		apt install -qq -y -t bookworm-backports golang-1.20
-		ln -sf /usr/lib/go-1.20/bin/go /usr/local/bin/go
+		apt install -qq -y -t bookworm-backports golang-$DEP_GOLANG_VER
+		ln -sf /usr/lib/go-$DEP_GOLANG_VER/bin/go /usr/local/bin/go
 		adduser --quiet --comment forgejo --disabled-password forgejo
 		chown -R forgejo:forgejo .
+		if [ "$DEP_GOLANG_NODEB_REV" ];then
+			su forgejo -c "./.ci-make.sh forgejo-test-deps_upgrade-go $DEP_GOLANG_VER $DEP_GOLANG_NODEB_REV"
+		fi
+		;;
+	"forgejo-test-deps_upgrade-go")
+		go install golang.org/dl/go$2.$3@latest
+		ln -s ~/go/bin/go$2.$3 ~/go/bin/go
+		export PATH="$HOME/go/bin:$PATH"
+		go download
+		go version
 		;;
 esac
 		

.crystalintegration.yml

@@ -1,3 +1,4 @@
+labels:
   platform: linux/amd64
 
 when:
@@ -5,9 +6,9 @@ when:
 
 variables:
   - &ci_verify_image 'sc.cryxtal.org/ci-img/git-curl-jq:latest'
-  - &golang_image 'golang:1.20-bullseye'
+  - &golang_image 'golang:1.22-bullseye'
   - &forgejo_test_image 'docker.io/node:20-bookworm'
-  - &nodejs_image 'node:lts'
+  - &nodejs_image 'docker.io/node:20-bookworm'
   - &bin_dl_image 'sc.cryxtal.org/ci-img/bin-dl:latest'
   - &deb_build_image 'sc.cryxtal.org/ci-img/dh:bullseye'
   - &deb_test_image_bullseye 'sc.cryxtal.org/ci-img/deb-test:bullseye'
@@ -16,8 +17,10 @@ variables:
   - &deb_test_image_sid 'sc.cryxtal.org/ci-img/deb-test:sid'
   - &deb_test_image_jammy 'sc.cryxtal.org/ci-img/deb-test-ubuntu:jammy'
   - &deb_test_image_focal 'sc.cryxtal.org/ci-img/deb-test-ubuntu:focal'
-  - &deb_test_image_kinetic 'sc.cryxtal.org/ci-img/deb-test-ubuntu:kinetic'
+  - &deb_test_image_mantic 'sc.cryxtal.org/ci-img/deb-test-ubuntu:mantic'
   - &deb_test_image_lunar 'sc.cryxtal.org/ci-img/deb-test-ubuntu:lunar'
+  - &forgejo_test_golang_ver '1.22'
+  - &forgejo_test_golang_nodeb_rev '2'
   - &build_submodule 'forgejo'
   - &goproxy_override ''
   - &goproxy_setup |-
@@ -37,7 +40,7 @@ workspace:
   path: src/cryxtal/forgejo-deb
 
 clone:
-  clone-recursive:
+  git:
     image: woodpeckerci/plugin-git
     settings:
       recursive: true
@@ -51,6 +54,15 @@ steps:
       - git fetch --tags --force
       - git submodule foreach 'git fetch --tags --force'
 
+  git-push-codeberg:
+    image: *ci_verify_image
+    secrets: [ cb_git_auth ]
+    commands:
+      - git remote add codeberg https://$CB_GIT_AUTH@codeberg.org/forgejo-contrib/forgejo-deb
+      - if ( $(git rev-parse --is-shallow-repository) == "true" );then git fetch --unshallow origin ;fi
+      - git fetch codeberg
+      - git push codeberg --tags refs/remotes/origin/*:refs/heads/*
+
   ci-verify:
     image: *ci_verify_image
     group: deps
@@ -73,8 +85,6 @@ steps:
     environment:
       BUILD_SUBMODULE: *build_submodule
       GOPROXY_OVERRIDE: *goproxy_override
-    secrets:
-      - goproxy_default
     commands:
       - *goproxy_setup
       - ./.ci-make.sh submodule-make "$BUILD_SUBMODULE" deps-backend
@@ -93,8 +103,6 @@ steps:
     environment:
       BUILD_SUBMODULE: *build_submodule
       GOPROXY_OVERRIDE: *goproxy_override
-    secrets:
-      - goproxy_default
     commands:
       - *goproxy_setup
       - ./.ci-make.sh submodule-make "$BUILD_SUBMODULE" security-check
@@ -104,8 +112,8 @@ steps:
     group: checks
     environment:
       GOPROXY_OVERRIDE: *goproxy_override
-    secrets:
-      - goproxy_default
+      DEP_GOLANG_VER: *forgejo_test_golang_ver
+      DEP_GOLANG_NODEB_REV: *forgejo_test_golang_nodeb_rev
     commands:
       - *goproxy_setup
       - ./.ci-make.sh forgejo-test-deps
@@ -136,8 +144,6 @@ steps:
       GOSUMDB: sum.golang.org
       TAGS: bindata
       GOPROXY_OVERRIDE: *goproxy_override
-    secrets:
-      - goproxy_default
     commands:
       - *goproxy_setup
       - ./.ci-make.sh submodule-build "$BUILD_SUBMODULE" forgejo-bin
@@ -149,8 +155,6 @@ steps:
       GOSUMDB: sum.golang.org
       TAGS: bindata sqlite sqlite_unlock_notify
       GOPROXY_OVERRIDE: *goproxy_override
-    secrets:
-      - goproxy_default
     commands:
       - *goproxy_setup
       - ./.ci-make.sh submodule-build "$BUILD_SUBMODULE" forgejo-sqlite-bin
@@ -225,8 +229,8 @@ steps:
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb
 
-  test-inst-kinetic-sqlite:
-    image: *deb_test_image_kinetic
+  test-inst-mantic-sqlite:
+    image: *deb_test_image_mantic
     group: pkg-test-3
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb
@@ -285,8 +289,8 @@ steps:
     when:
       event: [ tag ]
 
-  test-inst-kinetic-bin:
-    image: *deb_test_image_kinetic
+  test-inst-mantic-bin:
+    image: *deb_test_image_mantic
     group: pkg-test-5
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb

deb/debian/NEWS

@@ -0,0 +1,14 @@
+forgejo (1.21.4.0-2) unstable; urgency=medium
+
+  WARNING: Forgejo will be upgraded to v1.21.4-0
+
+  Please read the Forgejo v1.21 release announcement and the release notes
+  for all v1.21.x-x versions and make any necessary adjustments to your
+  configuration before proceeding with the upgrade.
+
+  You may need to manually restart Forgejo after the upgrade is complete.
+
+  https://forgejo.org/2023-11-release-v1211-0/
+  https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-4-0
+
+ -- crystal <crystal@noreply.codeberg.org>  Wed, 17 Jan 2024 00:00:00 +0000

deb/debian/changelog

@@ -1,3 +1,73 @@
+forgejo (7.0.0-1) unstable; urgency=medium
+
+  * Forgejo version 7.0.0
+  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#7-0-0
+
+ -- crystal <crystal@noreply.codeberg.org>  Tue, 23 Apr 2024 17:18:00 +0000
+
+forgejo (1.21.11.1-1) unstable; urgency=medium
+
+  * Forgejo version 1.21.11-1
+  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-11-1
+
+ -- crystal <crystal@noreply.codeberg.org>  Fri, 19 Apr 2024 15:46:00 +0000
+
+forgejo (1.21.11.0-1) unstable; urgency=medium
+
+  * Forgejo version 1.21.11-0
+  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-11-0
+
+ -- crystal <crystal@noreply.codeberg.org>  Thu, 18 Apr 2024 23:36:00 +0000
+
+forgejo (1.21.10.0-1) unstable; urgency=medium
+
+  * Forgejo version 1.21.10-0
+  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-10-0
+
+ -- crystal <crystal@noreply.codeberg.org>  Tue, 9 Apr 2024 11:27:00 +0000
+
+forgejo (1.21.8.0-1) unstable; urgency=medium
+
+  * Forgejo version 1.21.8-0
+  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-8-0
+
+ -- crystal <crystal@noreply.codeberg.org>  Sat, 23 Mar 2024 18:15:00 +0000
+
+forgejo (1.21.7.0-2) unstable; urgency=medium
+
+  * Forgejo version 1.21.7-0
+  * Add git dependency
+  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-7-0
+
+ -- crystal <crystal@noreply.codeberg.org>  Fri, 22 Mar 2024 21:35:00 +0000
+
+forgejo (1.21.6.0-1) unstable; urgency=medium
+
+  * Forgejo version 1.21.6-0
+  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-6-0
+
+ -- crystal <crystal@noreply.codeberg.org>  Sun, 25 Feb 2024 12:10:00 +0000
+
+forgejo (1.21.5.0-1) unstable; urgency=medium
+
+  * Forgejo version 1.21.5-0
+  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-5-0
+
+ -- crystal <crystal@noreply.codeberg.org>  Wed, 31 Jan 2024 22:22:00 +0000
+
+forgejo (1.21.4.0-2) unstable; urgency=medium
+
+  * Fix NEWS.Debian changelog
+
+ -- crystal <crystal@noreply.codeberg.org>  Wed, 17 Jan 2024 00:00:00 +0000
+
+forgejo (1.21.4.0-1) unstable; urgency=medium
+
+  * Forgejo version 1.21.4-0
+  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-4-0
+
+ -- crystal <crystal@noreply.codeberg.org>  Tue, 16 Jan 2024 23:03:00 +0000
+
 forgejo (1.20.6.1-0) unstable; urgency=medium
 
   * Forgejo version 1.20.6-1~deb0

deb/debian/control

@@ -8,7 +8,7 @@ Package: forgejo
 Architecture: amd64
 Priority: optional
 Provides: gitea
-Depends: adduser (>= 3.11)
+Depends: adduser (>= 3.11),git
 Conflicts: forgejo-sqlite,forgejo-bin
 Description: Forgejo: Beyond Coding. We Forge.
  Forgejo with bindata ONLY - Use this package for MySQL or PostgreSQL setup
@@ -17,7 +17,7 @@ Package: forgejo-sqlite
 Architecture: amd64
 Priority: optional
 Provides: forgejo,gitea
-Depends: adduser (>= 3.11)
+Depends: adduser (>= 3.11),git
 Conflicts: forgejo,forgejo-bin
 Description: Forgejo: Beyond Coding. We Forge. (SQLite)
  Forgejo with bindata and SQLite support - Use this package to get started immediately

forgejo

@@ -1 +1 @@
-Subproject commit 496b0acd22de9bf1305bf4b8bbe1c62cd95ec4fc
+Subproject commit 73c190af4c13a09453b878e255c31cd70ddd5ab9

repo-deb/main/debian/control

@@ -16,4 +16,4 @@ Architecture: all
 Priority: optional
 Replaces: forgejo-deb-repo
 Description: APT Repository signing key for forgejo-deb
- Debian Package Registry key for https://code.forgejo.org/crystal
+ Debian Package Registry key for https://code.forgejo.org/forgejo-contrib