From 4b9f5060fd2c326a19a96795fde1dbe82bc1b7fb Mon Sep 17 00:00:00 2001 From: crystal Date: Fri, 22 Mar 2024 15:35:27 -0600 Subject: [PATCH 1/5] add git dep --- deb/debian/changelog | 5 +++-- deb/debian/control | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/deb/debian/changelog b/deb/debian/changelog index 0656edb..cc80f3a 100644 --- a/deb/debian/changelog +++ b/deb/debian/changelog @@ -1,9 +1,10 @@ -forgejo (1.21.7.0-1) unstable; urgency=medium +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 Wed, 6 Mar 2024 23:14:00 +0000 + -- crystal Fri, 22 Mar 2024 21:35:00 +0000 forgejo (1.21.6.0-1) unstable; urgency=medium diff --git a/deb/debian/control b/deb/debian/control index d77bbe4..323d688 100644 --- a/deb/debian/control +++ b/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 From 0ab3730c43999aa84f23d2cb14c96021267b87b3 Mon Sep 17 00:00:00 2001 From: crystal Date: Fri, 22 Mar 2024 22:32:42 -0600 Subject: [PATCH 2/5] fix unshallow --- .crystalintegration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.crystalintegration.yml b/.crystalintegration.yml index 8903b62..d8112af 100644 --- a/.crystalintegration.yml +++ b/.crystalintegration.yml @@ -58,7 +58,7 @@ steps: secrets: [ cb_git_auth ] commands: - git remote add codeberg https://$CB_GIT_AUTH@codeberg.org/forgejo-contrib/forgejo-deb - - git fetch --unshallow origin + - 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/* From e4af7ff15105d793745f9e29a663713845e7fe3b Mon Sep 17 00:00:00 2001 From: crystal Date: Sat, 23 Mar 2024 11:27:13 -0600 Subject: [PATCH 3/5] fix then --- .crystalintegration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.crystalintegration.yml b/.crystalintegration.yml index d8112af..0821dab 100644 --- a/.crystalintegration.yml +++ b/.crystalintegration.yml @@ -58,7 +58,7 @@ steps: 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 + - 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/* From 8f030778e0a6636264e04164ac5d93591f39b18c Mon Sep 17 00:00:00 2001 From: crystal Date: Sat, 23 Mar 2024 12:15:03 -0600 Subject: [PATCH 4/5] Forgejo v1.21.8-0 --- deb/debian/changelog | 7 +++++++ forgejo | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/deb/debian/changelog b/deb/debian/changelog index cc80f3a..9c7bda0 100644 --- a/deb/debian/changelog +++ b/deb/debian/changelog @@ -1,3 +1,10 @@ +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 Sat, 23 Mar 2024 18:15:00 +0000 + forgejo (1.21.7.0-2) unstable; urgency=medium * Forgejo version 1.21.7-0 diff --git a/forgejo b/forgejo index 6e877f0..4092c54 160000 --- a/forgejo +++ b/forgejo @@ -1 +1 @@ -Subproject commit 6e877f02ab3be43c02de4a2edbfefe4919c02079 +Subproject commit 4092c544ca01aaaebb9596449e79eaf29a8d91ff From de74368c1bc83e56829c0436b95a3ab240604cfc Mon Sep 17 00:00:00 2001 From: crystal Date: Sat, 23 Mar 2024 12:50:19 -0600 Subject: [PATCH 5/5] apt -y --- .ci-make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci-make.sh b/.ci-make.sh index 52d48df..597be52 100755 --- a/.ci-make.sh +++ b/.ci-make.sh @@ -124,7 +124,7 @@ case "$1" in 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 &