From 42f4030384866b4709fb7eda8a15d182e2a3675a Mon Sep 17 00:00:00 2001 From: crystal Date: Sun, 28 Apr 2024 07:13:58 -0600 Subject: [PATCH 01/35] Add apt-listchanges dep --- repo-deb/main/debian/changelog | 6 ++++++ repo-deb/main/debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/repo-deb/main/debian/changelog b/repo-deb/main/debian/changelog index 088aae2..4024742 100644 --- a/repo-deb/main/debian/changelog +++ b/repo-deb/main/debian/changelog @@ -1,3 +1,9 @@ +forgejo-deb-repo (2-2) unstable; urgency=medium + + * Add apt-listchanges dep for important upgrade notices + + -- crystal Sun, 28 Apr 2024 13:13:00 +0000 + forgejo-deb-repo (2-1) unstable; urgency=medium * Move to https://code.forgejo.org/forgejo-contrib/-/packages diff --git a/repo-deb/main/debian/control b/repo-deb/main/debian/control index 7a929c1..9a2df0b 100644 --- a/repo-deb/main/debian/control +++ b/repo-deb/main/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 10) Package: forgejo-deb-repo Architecture: all Priority: optional -Depends: forgejo-deb-repokey, apt-transport-https +Depends: forgejo-deb-repokey, apt-transport-https, apt-listchanges Description: APT Repository for forgejo-deb builds Forgejo will be updated via apt along with other software on your system From 856693ebcff1d4d8383feeea3bb45125913d0e68 Mon Sep 17 00:00:00 2001 From: crystal Date: Sun, 28 Apr 2024 07:27:34 -0600 Subject: [PATCH 02/35] [temp] publish repo deb --- .forgejo/workflows/forgejo-deb.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/.forgejo/workflows/forgejo-deb.yml b/.forgejo/workflows/forgejo-deb.yml index 796677a..230e554 100644 --- a/.forgejo/workflows/forgejo-deb.yml +++ b/.forgejo/workflows/forgejo-deb.yml @@ -191,6 +191,34 @@ jobs: - run: ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb + publish-repo-deb: + runs-on: bookworm + if: github.event_name == 'push' && github.repository == 'forgejo-contrib/forgejo-deb' + steps: + - uses: actions/checkout@v4 + + - name: actions prep + id: ciprep + run: ./.ci-make.sh actions-prep + + - uses: actions/download-artifact@v3 + with: + name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }} + + - uses: crystal/install-jq-action@v2.1.0 + + - name: Debian package registry publish + env: + FORGEJO_SITE: https://code.forgejo.org + FORGEJO_OWNER: forgejo-contrib + DEBIAN_DIST: bullseye + DEBIAN_COMPONENT: forgejo + FORGEJO_KEY: ${{ secrets.cfo_api_key }} + run: | + cd repo-deb + ../.ci-forgejo-apt.sh forgejo-deb-repo_2-*_all.deb + cd .. + publish-release-repo: runs-on: bookworm if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') From cee5e87ae316c1f3a899e1e4c1e5150db96d8eb3 Mon Sep 17 00:00:00 2001 From: crystal Date: Sun, 28 Apr 2024 08:11:19 -0600 Subject: [PATCH 03/35] Revert "[temp] publish repo deb" This reverts commit 856693ebcff1d4d8383feeea3bb45125913d0e68. --- .forgejo/workflows/forgejo-deb.yml | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/.forgejo/workflows/forgejo-deb.yml b/.forgejo/workflows/forgejo-deb.yml index 230e554..796677a 100644 --- a/.forgejo/workflows/forgejo-deb.yml +++ b/.forgejo/workflows/forgejo-deb.yml @@ -191,34 +191,6 @@ jobs: - run: ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb - publish-repo-deb: - runs-on: bookworm - if: github.event_name == 'push' && github.repository == 'forgejo-contrib/forgejo-deb' - steps: - - uses: actions/checkout@v4 - - - name: actions prep - id: ciprep - run: ./.ci-make.sh actions-prep - - - uses: actions/download-artifact@v3 - with: - name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }} - - - uses: crystal/install-jq-action@v2.1.0 - - - name: Debian package registry publish - env: - FORGEJO_SITE: https://code.forgejo.org - FORGEJO_OWNER: forgejo-contrib - DEBIAN_DIST: bullseye - DEBIAN_COMPONENT: forgejo - FORGEJO_KEY: ${{ secrets.cfo_api_key }} - run: | - cd repo-deb - ../.ci-forgejo-apt.sh forgejo-deb-repo_2-*_all.deb - cd .. - publish-release-repo: runs-on: bookworm if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') From 6b780077a15230a5bc46fa12e0e47f0b239a315c Mon Sep 17 00:00:00 2001 From: crystal Date: Sun, 28 Apr 2024 08:18:23 -0600 Subject: [PATCH 04/35] allow for self-hosted tests --- .action-forgejo-mirror.sh | 6 +----- .forgejo/workflows/forgejo-deb.yml | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.action-forgejo-mirror.sh b/.action-forgejo-mirror.sh index 43b1abf..84df16c 100755 --- a/.action-forgejo-mirror.sh +++ b/.action-forgejo-mirror.sh @@ -1,11 +1,7 @@ #!/usr/bin/env bash -if [ "$GITHUB_REPOSITORY_OWNER" = "crystal" ] ; then - echo "crystal_pr: skipping mirror!" - exit 0 -fi git fetch --tags -git remote add action-forgejo-mirror https://forgejo-deb:$FORGEJO_KEY@$FORGEJO_DEST/$GITHUB_REPOSITORY +git remote add action-forgejo-mirror https://action-forgejo-mirror:$FORGEJO_KEY@$FORGEJO_DEST/$GITHUB_REPOSITORY git push action-forgejo-mirror --all git push action-forgejo-mirror --tags "refs/remotes/origin/*:refs/heads/*" git remote remove action-forgejo-mirror diff --git a/.forgejo/workflows/forgejo-deb.yml b/.forgejo/workflows/forgejo-deb.yml index 796677a..1c66728 100644 --- a/.forgejo/workflows/forgejo-deb.yml +++ b/.forgejo/workflows/forgejo-deb.yml @@ -2,7 +2,7 @@ on: [push, pull_request] jobs: mirror: runs-on: bookworm - if: github.event_name == 'push' + if: github.event_name == 'push' && github.repository == 'forgejo-contrib/forgejo-deb' steps: - uses: actions/checkout@v4 with: @@ -193,7 +193,7 @@ jobs: publish-release-repo: runs-on: bookworm - if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') + if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') && github.repository == 'forgejo-contrib/forgejo-deb' steps: - uses: actions/checkout@v4 From 22a152e1881a2d1903a72230eb81267b2add6e6d Mon Sep 17 00:00:00 2001 From: crystal Date: Sun, 28 Apr 2024 10:11:58 -0600 Subject: [PATCH 05/35] [squash] repo-deb lts channel --- repo-deb/forgejo-deb.list | 2 +- repo-deb/main/debian/NEWS | 22 ++++++++++++++++++++++ repo-deb/main/debian/changelog | 6 ++++++ repo-deb/main/debian/control | 1 + 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 repo-deb/main/debian/NEWS diff --git a/repo-deb/forgejo-deb.list b/repo-deb/forgejo-deb.list index 946a727..8a6def5 100644 --- a/repo-deb/forgejo-deb.list +++ b/repo-deb/forgejo-deb.list @@ -1 +1 @@ -deb https://code.forgejo.org/api/packages/forgejo-contrib/debian bullseye forgejo +deb https://code.forgejo.org/api/packages/forgejo-contrib/debian bullseye forgejo-lts diff --git a/repo-deb/main/debian/NEWS b/repo-deb/main/debian/NEWS new file mode 100644 index 0000000..e5cdf22 --- /dev/null +++ b/repo-deb/main/debian/NEWS @@ -0,0 +1,22 @@ +forgejo-deb-repo (2-3) unstable; urgency=medium + + WARNING: You are switching to the Forgejo LTS release channel! + + After this upgrade is complete, you must run `apt upgrade` again to upgrade + to Forgejo 7.0.x LTS. You will no longer recieve new major Forgejo versions + until the next LTS version is available. + + If you wish to switch to the standard release channel, use the following + command to install the setup package. This package will be removed when the + release channel is successfully switched during the upgrade. + + `sudo apt install forgejo-deb-repo-stable && sudo apt update && sudo apt upgrade` + + Please read the Forgejo v7.0 release announcement and the release notes + for all v7.0.x versions and make any necessary adjustments to your + configuration before proceeding with the upgrade. + + https://forgejo.org/2024-04-release-v7-0/ + https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#7-0-1 + + -- crystal Sun, 28 Apr 2024 15:00:00 +0000 diff --git a/repo-deb/main/debian/changelog b/repo-deb/main/debian/changelog index 4024742..f9d0a22 100644 --- a/repo-deb/main/debian/changelog +++ b/repo-deb/main/debian/changelog @@ -1,3 +1,9 @@ +forgejo-deb-repo (2-3) unstable; urgency=medium + + * Switch to forgejo-lts component (LTS release channel) + + -- crystal Sun, 28 Apr 2024 14:59:00 +0000 + forgejo-deb-repo (2-2) unstable; urgency=medium * Add apt-listchanges dep for important upgrade notices diff --git a/repo-deb/main/debian/control b/repo-deb/main/debian/control index 9a2df0b..ff33adb 100644 --- a/repo-deb/main/debian/control +++ b/repo-deb/main/debian/control @@ -8,6 +8,7 @@ Package: forgejo-deb-repo Architecture: all Priority: optional Depends: forgejo-deb-repokey, apt-transport-https, apt-listchanges +Conflicts: forgejo-deb-repo-lts Description: APT Repository for forgejo-deb builds Forgejo will be updated via apt along with other software on your system From 0aedcd394d50974f45262746899d4585167af66e Mon Sep 17 00:00:00 2001 From: crystal Date: Sun, 28 Apr 2024 10:12:48 -0600 Subject: [PATCH 06/35] [temp] repo-deb lts transitional push --- .forgejo/workflows/forgejo-deb.yml | 53 +++++++++++++++++++ repo-deb/build.sh | 3 +- repo-deb/forgejo-deb.list_stub | 1 + repo-deb/main/debian/control | 6 +++ .../main/debian/forgejo-deb-repo-lts.install | 1 + repo-deb/stub/debian/changelog | 2 +- 6 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 repo-deb/forgejo-deb.list_stub create mode 100644 repo-deb/main/debian/forgejo-deb-repo-lts.install diff --git a/.forgejo/workflows/forgejo-deb.yml b/.forgejo/workflows/forgejo-deb.yml index 1c66728..b96cc8e 100644 --- a/.forgejo/workflows/forgejo-deb.yml +++ b/.forgejo/workflows/forgejo-deb.yml @@ -191,6 +191,59 @@ jobs: - run: ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb + publish-repo-deb: + runs-on: bookworm + if: github.event_name == 'push' && github.repository == 'forgejo-contrib/forgejo-deb' + steps: + - uses: actions/checkout@v4 + + - name: actions prep + id: ciprep + run: ./.ci-make.sh actions-prep + + - uses: actions/download-artifact@v3 + with: + name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }} + + - uses: crystal/install-jq-action@v2.1.0 + + - name: "Debian package registry publish: forgejo-deb-repo" + env: + FORGEJO_SITE: https://code.forgejo.org + FORGEJO_OWNER: forgejo-contrib + DEBIAN_DIST: bullseye + DEBIAN_COMPONENT: forgejo-lts + FORGEJO_KEY: ${{ secrets.cfo_api_key }} + run: | + cd repo-deb + ../.ci-forgejo-apt.sh forgejo-deb-repo_2-3_all.deb + cd .. + + - name: "Debian package registry publish: forgejo-deb-repo-lts" + env: + FORGEJO_SITE: https://code.forgejo.org + FORGEJO_OWNER: forgejo-contrib + DEBIAN_DIST: bullseye + DEBIAN_COMPONENT: forgejo + FORGEJO_KEY: ${{ secrets.cfo_api_key }} + run: | + cd repo-deb + ../.ci-forgejo-apt.sh forgejo-deb-repo-lts_2-3_all.deb + cd .. + + - run: sudo apt install -y wget + - run: wget --content-disposition https://code.forgejo.org/forgejo-contrib/-/packages/debian/forgejo-deb-repokey/2-1/files/2918 + + - name: "Debian package registry publish: forgejo-deb-repokey" + env: + FORGEJO_SITE: https://code.forgejo.org + FORGEJO_OWNER: forgejo-contrib + DEBIAN_DIST: bullseye + DEBIAN_COMPONENT: forgejo-lts + FORGEJO_KEY: ${{ secrets.cfo_api_key }} + run: | + ./.ci-forgejo-apt.sh forgejo-deb-repokey_2-1_all.deb + publish-release-repo: runs-on: bookworm if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') && github.repository == 'forgejo-contrib/forgejo-deb' diff --git a/repo-deb/build.sh b/repo-deb/build.sh index bdb1ef2..076c6e7 100755 --- a/repo-deb/build.sh +++ b/repo-deb/build.sh @@ -2,8 +2,9 @@ cp code-forgejo-org-forgejo-contrib.asc stub/ cp code-forgejo-org-forgejo-contrib.asc main/ -cp forgejo-deb.list stub/ +cp forgejo-deb.list_stub stub/forgejo-deb.list cp forgejo-deb.list main/ +cp forgejo-deb.list main/forgejo-deb-lts.list if [ "$1" = "actions" ] ; then PACKAGE_BUILD_EXTRA_ARGS="--no-sign" fi diff --git a/repo-deb/forgejo-deb.list_stub b/repo-deb/forgejo-deb.list_stub new file mode 100644 index 0000000..3465729 --- /dev/null +++ b/repo-deb/forgejo-deb.list_stub @@ -0,0 +1 @@ +deb https://code.forgejo.org/api/packages/forgejo-contrib/debian bullseye forgejo forgejo-lts diff --git a/repo-deb/main/debian/control b/repo-deb/main/debian/control index ff33adb..c8e8cc9 100644 --- a/repo-deb/main/debian/control +++ b/repo-deb/main/debian/control @@ -18,3 +18,9 @@ Priority: optional Replaces: forgejo-deb-repo Description: APT Repository signing key for forgejo-deb Debian Package Registry key for https://code.forgejo.org/forgejo-contrib + +Package: forgejo-deb-repo-lts +Architecture: all +Priority: optional +Description: Switch to Forgejo LTS release channel + Transitional package to switch forgejo-deb-repo to LTS component diff --git a/repo-deb/main/debian/forgejo-deb-repo-lts.install b/repo-deb/main/debian/forgejo-deb-repo-lts.install new file mode 100644 index 0000000..9b8fe96 --- /dev/null +++ b/repo-deb/main/debian/forgejo-deb-repo-lts.install @@ -0,0 +1 @@ +forgejo-deb-lts.list /etc/apt/sources.list.d diff --git a/repo-deb/stub/debian/changelog b/repo-deb/stub/debian/changelog index 84cc044..d0f5ad0 100644 --- a/repo-deb/stub/debian/changelog +++ b/repo-deb/stub/debian/changelog @@ -2,4 +2,4 @@ forgejo-deb-repo (0-0) unstable; urgency=medium * forgejo-deb APT repository stub - -- crystal Tue, 25 Jul 2023 10:50:00 +0000 + -- crystal Sun, 28 Jul 2024 15:26:00 +0000 From 5e142ef06c64e58a254918b9aaf82fa1a4ac9bd9 Mon Sep 17 00:00:00 2001 From: crystal Date: Sun, 28 Apr 2024 10:57:52 -0600 Subject: [PATCH 07/35] partial revert #32 partially revert 0aedcd394d --- .forgejo/workflows/forgejo-deb.yml | 26 +------------------ repo-deb/build.sh | 3 +-- repo-deb/forgejo-deb.list_stub | 1 - repo-deb/main/debian/control | 6 ----- .../main/debian/forgejo-deb-repo-lts.install | 1 - repo-deb/stub/debian/changelog | 2 +- 6 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 repo-deb/forgejo-deb.list_stub delete mode 100644 repo-deb/main/debian/forgejo-deb-repo-lts.install diff --git a/.forgejo/workflows/forgejo-deb.yml b/.forgejo/workflows/forgejo-deb.yml index b96cc8e..7b969fd 100644 --- a/.forgejo/workflows/forgejo-deb.yml +++ b/.forgejo/workflows/forgejo-deb.yml @@ -199,7 +199,7 @@ jobs: - name: actions prep id: ciprep - run: ./.ci-make.sh actions-prep + run: ./.ci-make.sh actions-prep installtest - uses: actions/download-artifact@v3 with: @@ -207,30 +207,6 @@ jobs: - uses: crystal/install-jq-action@v2.1.0 - - name: "Debian package registry publish: forgejo-deb-repo" - env: - FORGEJO_SITE: https://code.forgejo.org - FORGEJO_OWNER: forgejo-contrib - DEBIAN_DIST: bullseye - DEBIAN_COMPONENT: forgejo-lts - FORGEJO_KEY: ${{ secrets.cfo_api_key }} - run: | - cd repo-deb - ../.ci-forgejo-apt.sh forgejo-deb-repo_2-3_all.deb - cd .. - - - name: "Debian package registry publish: forgejo-deb-repo-lts" - env: - FORGEJO_SITE: https://code.forgejo.org - FORGEJO_OWNER: forgejo-contrib - DEBIAN_DIST: bullseye - DEBIAN_COMPONENT: forgejo - FORGEJO_KEY: ${{ secrets.cfo_api_key }} - run: | - cd repo-deb - ../.ci-forgejo-apt.sh forgejo-deb-repo-lts_2-3_all.deb - cd .. - - run: sudo apt install -y wget - run: wget --content-disposition https://code.forgejo.org/forgejo-contrib/-/packages/debian/forgejo-deb-repokey/2-1/files/2918 diff --git a/repo-deb/build.sh b/repo-deb/build.sh index 076c6e7..bdb1ef2 100755 --- a/repo-deb/build.sh +++ b/repo-deb/build.sh @@ -2,9 +2,8 @@ cp code-forgejo-org-forgejo-contrib.asc stub/ cp code-forgejo-org-forgejo-contrib.asc main/ -cp forgejo-deb.list_stub stub/forgejo-deb.list +cp forgejo-deb.list stub/ cp forgejo-deb.list main/ -cp forgejo-deb.list main/forgejo-deb-lts.list if [ "$1" = "actions" ] ; then PACKAGE_BUILD_EXTRA_ARGS="--no-sign" fi diff --git a/repo-deb/forgejo-deb.list_stub b/repo-deb/forgejo-deb.list_stub deleted file mode 100644 index 3465729..0000000 --- a/repo-deb/forgejo-deb.list_stub +++ /dev/null @@ -1 +0,0 @@ -deb https://code.forgejo.org/api/packages/forgejo-contrib/debian bullseye forgejo forgejo-lts diff --git a/repo-deb/main/debian/control b/repo-deb/main/debian/control index c8e8cc9..ff33adb 100644 --- a/repo-deb/main/debian/control +++ b/repo-deb/main/debian/control @@ -18,9 +18,3 @@ Priority: optional Replaces: forgejo-deb-repo Description: APT Repository signing key for forgejo-deb Debian Package Registry key for https://code.forgejo.org/forgejo-contrib - -Package: forgejo-deb-repo-lts -Architecture: all -Priority: optional -Description: Switch to Forgejo LTS release channel - Transitional package to switch forgejo-deb-repo to LTS component diff --git a/repo-deb/main/debian/forgejo-deb-repo-lts.install b/repo-deb/main/debian/forgejo-deb-repo-lts.install deleted file mode 100644 index 9b8fe96..0000000 --- a/repo-deb/main/debian/forgejo-deb-repo-lts.install +++ /dev/null @@ -1 +0,0 @@ -forgejo-deb-lts.list /etc/apt/sources.list.d diff --git a/repo-deb/stub/debian/changelog b/repo-deb/stub/debian/changelog index d0f5ad0..84cc044 100644 --- a/repo-deb/stub/debian/changelog +++ b/repo-deb/stub/debian/changelog @@ -2,4 +2,4 @@ forgejo-deb-repo (0-0) unstable; urgency=medium * forgejo-deb APT repository stub - -- crystal Sun, 28 Jul 2024 15:26:00 +0000 + -- crystal Tue, 25 Jul 2023 10:50:00 +0000 From 2907295f728a851de4e3ad50aeed1c79300de0ab Mon Sep 17 00:00:00 2001 From: crystal Date: Sun, 28 Apr 2024 11:58:09 -0600 Subject: [PATCH 08/35] complex partial revert #33 reverts most of 5e142ef06c 0aedcd394d will need another complex revert --- .forgejo/workflows/forgejo-deb.yml | 13 ++++++------- repo-deb/build.sh | 3 ++- repo-deb/forgejo-deb.list_stub | 1 + repo-deb/main/debian/NEWS | 14 +++++++++----- repo-deb/main/debian/changelog | 4 ++-- repo-deb/main/debian/control | 6 ++++++ repo-deb/main/debian/forgejo-deb-repo-lts.install | 1 + repo-deb/main/debian/forgejo-deb-repo-lts.prerm | 5 +++++ repo-deb/stub/debian/changelog | 2 +- 9 files changed, 33 insertions(+), 16 deletions(-) create mode 100644 repo-deb/forgejo-deb.list_stub create mode 100644 repo-deb/main/debian/forgejo-deb-repo-lts.install create mode 100644 repo-deb/main/debian/forgejo-deb-repo-lts.prerm diff --git a/.forgejo/workflows/forgejo-deb.yml b/.forgejo/workflows/forgejo-deb.yml index 7b969fd..368af2e 100644 --- a/.forgejo/workflows/forgejo-deb.yml +++ b/.forgejo/workflows/forgejo-deb.yml @@ -199,7 +199,7 @@ jobs: - name: actions prep id: ciprep - run: ./.ci-make.sh actions-prep installtest + run: ./.ci-make.sh actions-prep - uses: actions/download-artifact@v3 with: @@ -207,18 +207,17 @@ jobs: - uses: crystal/install-jq-action@v2.1.0 - - run: sudo apt install -y wget - - run: wget --content-disposition https://code.forgejo.org/forgejo-contrib/-/packages/debian/forgejo-deb-repokey/2-1/files/2918 - - - name: "Debian package registry publish: forgejo-deb-repokey" + - name: "Debian package registry publish: forgejo-deb-repo-lts" env: FORGEJO_SITE: https://code.forgejo.org FORGEJO_OWNER: forgejo-contrib DEBIAN_DIST: bullseye - DEBIAN_COMPONENT: forgejo-lts + DEBIAN_COMPONENT: forgejo FORGEJO_KEY: ${{ secrets.cfo_api_key }} run: | - ./.ci-forgejo-apt.sh forgejo-deb-repokey_2-1_all.deb + cd repo-deb + ../.ci-forgejo-apt.sh forgejo-deb-repo-lts_2-4_all.deb + cd .. publish-release-repo: runs-on: bookworm diff --git a/repo-deb/build.sh b/repo-deb/build.sh index bdb1ef2..076c6e7 100755 --- a/repo-deb/build.sh +++ b/repo-deb/build.sh @@ -2,8 +2,9 @@ cp code-forgejo-org-forgejo-contrib.asc stub/ cp code-forgejo-org-forgejo-contrib.asc main/ -cp forgejo-deb.list stub/ +cp forgejo-deb.list_stub stub/forgejo-deb.list cp forgejo-deb.list main/ +cp forgejo-deb.list main/forgejo-deb-lts.list if [ "$1" = "actions" ] ; then PACKAGE_BUILD_EXTRA_ARGS="--no-sign" fi diff --git a/repo-deb/forgejo-deb.list_stub b/repo-deb/forgejo-deb.list_stub new file mode 100644 index 0000000..3465729 --- /dev/null +++ b/repo-deb/forgejo-deb.list_stub @@ -0,0 +1 @@ +deb https://code.forgejo.org/api/packages/forgejo-contrib/debian bullseye forgejo forgejo-lts diff --git a/repo-deb/main/debian/NEWS b/repo-deb/main/debian/NEWS index e5cdf22..d2ae9fc 100644 --- a/repo-deb/main/debian/NEWS +++ b/repo-deb/main/debian/NEWS @@ -1,4 +1,4 @@ -forgejo-deb-repo (2-3) unstable; urgency=medium +forgejo-deb-repo (2-4) unstable; urgency=medium WARNING: You are switching to the Forgejo LTS release channel! @@ -7,16 +7,20 @@ forgejo-deb-repo (2-3) unstable; urgency=medium until the next LTS version is available. If you wish to switch to the standard release channel, use the following - command to install the setup package. This package will be removed when the + commands to install the setup package. This package will be removed when the release channel is successfully switched during the upgrade. + + sudo apt install forgejo-deb-repo-stable + sudo apt update + sudo apt full-upgrade - `sudo apt install forgejo-deb-repo-stable && sudo apt update && sudo apt upgrade` + More info: https://codeberg.org/forgejo-contrib/forgejo-deb/issues/35 Please read the Forgejo v7.0 release announcement and the release notes for all v7.0.x versions and make any necessary adjustments to your - configuration before proceeding with the upgrade. + configuration before proceeding with the following upgrade. https://forgejo.org/2024-04-release-v7-0/ https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#7-0-1 - -- crystal Sun, 28 Apr 2024 15:00:00 +0000 + -- crystal Sun, 28 Apr 2024 17:48:00 +0000 diff --git a/repo-deb/main/debian/changelog b/repo-deb/main/debian/changelog index f9d0a22..6d67096 100644 --- a/repo-deb/main/debian/changelog +++ b/repo-deb/main/debian/changelog @@ -1,8 +1,8 @@ -forgejo-deb-repo (2-3) unstable; urgency=medium +forgejo-deb-repo (2-4) unstable; urgency=medium * Switch to forgejo-lts component (LTS release channel) - -- crystal Sun, 28 Apr 2024 14:59:00 +0000 + -- crystal Sun, 28 Apr 2024 17:48:00 +0000 forgejo-deb-repo (2-2) unstable; urgency=medium diff --git a/repo-deb/main/debian/control b/repo-deb/main/debian/control index ff33adb..c8e8cc9 100644 --- a/repo-deb/main/debian/control +++ b/repo-deb/main/debian/control @@ -18,3 +18,9 @@ Priority: optional Replaces: forgejo-deb-repo Description: APT Repository signing key for forgejo-deb Debian Package Registry key for https://code.forgejo.org/forgejo-contrib + +Package: forgejo-deb-repo-lts +Architecture: all +Priority: optional +Description: Switch to Forgejo LTS release channel + Transitional package to switch forgejo-deb-repo to LTS component diff --git a/repo-deb/main/debian/forgejo-deb-repo-lts.install b/repo-deb/main/debian/forgejo-deb-repo-lts.install new file mode 100644 index 0000000..9b8fe96 --- /dev/null +++ b/repo-deb/main/debian/forgejo-deb-repo-lts.install @@ -0,0 +1 @@ +forgejo-deb-lts.list /etc/apt/sources.list.d diff --git a/repo-deb/main/debian/forgejo-deb-repo-lts.prerm b/repo-deb/main/debian/forgejo-deb-repo-lts.prerm new file mode 100644 index 0000000..ace5cca --- /dev/null +++ b/repo-deb/main/debian/forgejo-deb-repo-lts.prerm @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +RM_FILE="/etc/apt/sources.list.d/forgejo-deb-lts.list" +if [ -f "$RM_FILE" ]; then + rm "$RM_FILE" +fi diff --git a/repo-deb/stub/debian/changelog b/repo-deb/stub/debian/changelog index 84cc044..d0f5ad0 100644 --- a/repo-deb/stub/debian/changelog +++ b/repo-deb/stub/debian/changelog @@ -2,4 +2,4 @@ forgejo-deb-repo (0-0) unstable; urgency=medium * forgejo-deb APT repository stub - -- crystal Tue, 25 Jul 2023 10:50:00 +0000 + -- crystal Sun, 28 Jul 2024 15:26:00 +0000 From 43eaa353a8cbd6b8a4ba0f3cbe229a409b2e8a46 Mon Sep 17 00:00:00 2001 From: crystal Date: Sun, 28 Apr 2024 12:33:23 -0600 Subject: [PATCH 09/35] complex partial revert #36 #33 #32 this should be the last complex revert PR setting up a user friendly migration path for the repo component switch ended up being a lot more complicated than I initially expected there will be one more cleanup PR after this --- .forgejo/workflows/forgejo-deb.yml | 18 +++++++++++++++--- repo-deb/build.sh | 3 +-- repo-deb/forgejo-deb.list_stub | 1 - repo-deb/main/debian/control | 6 ------ .../main/debian/forgejo-deb-repo-lts.install | 1 - .../main/debian/forgejo-deb-repo-lts.prerm | 5 ----- repo-deb/stub/debian/changelog | 2 +- 7 files changed, 17 insertions(+), 19 deletions(-) delete mode 100644 repo-deb/forgejo-deb.list_stub delete mode 100644 repo-deb/main/debian/forgejo-deb-repo-lts.install delete mode 100644 repo-deb/main/debian/forgejo-deb-repo-lts.prerm diff --git a/.forgejo/workflows/forgejo-deb.yml b/.forgejo/workflows/forgejo-deb.yml index 368af2e..bea2fc9 100644 --- a/.forgejo/workflows/forgejo-deb.yml +++ b/.forgejo/workflows/forgejo-deb.yml @@ -207,16 +207,28 @@ jobs: - uses: crystal/install-jq-action@v2.1.0 - - name: "Debian package registry publish: forgejo-deb-repo-lts" + - name: "Debian package registry publish: forgejo-deb-repo stub" env: FORGEJO_SITE: https://code.forgejo.org FORGEJO_OWNER: forgejo-contrib DEBIAN_DIST: bullseye - DEBIAN_COMPONENT: forgejo + DEBIAN_COMPONENT: forgejo-lts FORGEJO_KEY: ${{ secrets.cfo_api_key }} run: | cd repo-deb - ../.ci-forgejo-apt.sh forgejo-deb-repo-lts_2-4_all.deb + ../.ci-forgejo-apt.sh forgejo-deb-repo_0-0_all.deb + cd .. + + - name: "Debian package registry publish: forgejo-deb-repo" + env: + FORGEJO_SITE: https://code.forgejo.org + FORGEJO_OWNER: forgejo-contrib + DEBIAN_DIST: bullseye + DEBIAN_COMPONENT: forgejo-lts + FORGEJO_KEY: ${{ secrets.cfo_api_key }} + run: | + cd repo-deb + ../.ci-forgejo-apt.sh forgejo-deb-repo_2-4_all.deb cd .. publish-release-repo: diff --git a/repo-deb/build.sh b/repo-deb/build.sh index 076c6e7..bdb1ef2 100755 --- a/repo-deb/build.sh +++ b/repo-deb/build.sh @@ -2,9 +2,8 @@ cp code-forgejo-org-forgejo-contrib.asc stub/ cp code-forgejo-org-forgejo-contrib.asc main/ -cp forgejo-deb.list_stub stub/forgejo-deb.list +cp forgejo-deb.list stub/ cp forgejo-deb.list main/ -cp forgejo-deb.list main/forgejo-deb-lts.list if [ "$1" = "actions" ] ; then PACKAGE_BUILD_EXTRA_ARGS="--no-sign" fi diff --git a/repo-deb/forgejo-deb.list_stub b/repo-deb/forgejo-deb.list_stub deleted file mode 100644 index 3465729..0000000 --- a/repo-deb/forgejo-deb.list_stub +++ /dev/null @@ -1 +0,0 @@ -deb https://code.forgejo.org/api/packages/forgejo-contrib/debian bullseye forgejo forgejo-lts diff --git a/repo-deb/main/debian/control b/repo-deb/main/debian/control index c8e8cc9..ff33adb 100644 --- a/repo-deb/main/debian/control +++ b/repo-deb/main/debian/control @@ -18,9 +18,3 @@ Priority: optional Replaces: forgejo-deb-repo Description: APT Repository signing key for forgejo-deb Debian Package Registry key for https://code.forgejo.org/forgejo-contrib - -Package: forgejo-deb-repo-lts -Architecture: all -Priority: optional -Description: Switch to Forgejo LTS release channel - Transitional package to switch forgejo-deb-repo to LTS component diff --git a/repo-deb/main/debian/forgejo-deb-repo-lts.install b/repo-deb/main/debian/forgejo-deb-repo-lts.install deleted file mode 100644 index 9b8fe96..0000000 --- a/repo-deb/main/debian/forgejo-deb-repo-lts.install +++ /dev/null @@ -1 +0,0 @@ -forgejo-deb-lts.list /etc/apt/sources.list.d diff --git a/repo-deb/main/debian/forgejo-deb-repo-lts.prerm b/repo-deb/main/debian/forgejo-deb-repo-lts.prerm deleted file mode 100644 index ace5cca..0000000 --- a/repo-deb/main/debian/forgejo-deb-repo-lts.prerm +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -RM_FILE="/etc/apt/sources.list.d/forgejo-deb-lts.list" -if [ -f "$RM_FILE" ]; then - rm "$RM_FILE" -fi diff --git a/repo-deb/stub/debian/changelog b/repo-deb/stub/debian/changelog index d0f5ad0..5dd821e 100644 --- a/repo-deb/stub/debian/changelog +++ b/repo-deb/stub/debian/changelog @@ -2,4 +2,4 @@ forgejo-deb-repo (0-0) unstable; urgency=medium * forgejo-deb APT repository stub - -- crystal Sun, 28 Jul 2024 15:26:00 +0000 + -- crystal Sun, 28 Jul 2024 18:25:00 +0000 From d0dfedd50fe2118a8c7c62cc25b454e7c742e2a6 Mon Sep 17 00:00:00 2001 From: crystal Date: Sun, 28 Apr 2024 13:03:48 -0600 Subject: [PATCH 10/35] cleanup #37 --- .forgejo/workflows/forgejo-deb.yml | 40 ------------------------------ 1 file changed, 40 deletions(-) diff --git a/.forgejo/workflows/forgejo-deb.yml b/.forgejo/workflows/forgejo-deb.yml index bea2fc9..1c66728 100644 --- a/.forgejo/workflows/forgejo-deb.yml +++ b/.forgejo/workflows/forgejo-deb.yml @@ -191,46 +191,6 @@ jobs: - run: ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb - publish-repo-deb: - runs-on: bookworm - if: github.event_name == 'push' && github.repository == 'forgejo-contrib/forgejo-deb' - steps: - - uses: actions/checkout@v4 - - - name: actions prep - id: ciprep - run: ./.ci-make.sh actions-prep - - - uses: actions/download-artifact@v3 - with: - name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }} - - - uses: crystal/install-jq-action@v2.1.0 - - - name: "Debian package registry publish: forgejo-deb-repo stub" - env: - FORGEJO_SITE: https://code.forgejo.org - FORGEJO_OWNER: forgejo-contrib - DEBIAN_DIST: bullseye - DEBIAN_COMPONENT: forgejo-lts - FORGEJO_KEY: ${{ secrets.cfo_api_key }} - run: | - cd repo-deb - ../.ci-forgejo-apt.sh forgejo-deb-repo_0-0_all.deb - cd .. - - - name: "Debian package registry publish: forgejo-deb-repo" - env: - FORGEJO_SITE: https://code.forgejo.org - FORGEJO_OWNER: forgejo-contrib - DEBIAN_DIST: bullseye - DEBIAN_COMPONENT: forgejo-lts - FORGEJO_KEY: ${{ secrets.cfo_api_key }} - run: | - cd repo-deb - ../.ci-forgejo-apt.sh forgejo-deb-repo_2-4_all.deb - cd .. - publish-release-repo: runs-on: bookworm if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') && github.repository == 'forgejo-contrib/forgejo-deb' From 804f3bef24a9cfbc07843dab32b59336292df214 Mon Sep 17 00:00:00 2001 From: crystal Date: Sun, 28 Apr 2024 23:32:13 -0600 Subject: [PATCH 11/35] [squash] POSIX logic for tag detection This never actually got executed in tests but the old logic only works in bash. Follow-up to #27 --- .ci-make.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci-make.sh b/.ci-make.sh index 8356dbc..5e471ab 100755 --- a/.ci-make.sh +++ b/.ci-make.sh @@ -97,13 +97,13 @@ case "$1" in git describe --tags HEAD CI_COMMIT_TAG_RESOLVE=$(git describe --tags HEAD --abbrev=0) echo "Closest existing tag: $CI_COMMIT_TAG_RESOLVE" - if [ "$CI_COMMIT_TAG_RESOLVE" = *"-dev" ] ; then + if [ "$CI_COMMIT_TAG_RESOLVE" != "${CI_COMMIT_TAG_RESOLVE%"-dev"}" ] || [ ! "$CI_COMMIT_TAG_RESOLVE" ] ; then if [ $PR_MODE ] ; then echo "I can't figure out which release version of Forgejo to build your PR against." echo "Whatever you're trying to do is not yet implemented." exit 97 fi - echo "err! building dev version- skipping binary dl" + echo "err! unable to resolve tag or building dev version- skipping binary dl" CI_COMMIT_TAG_RESOLVE= fi fi From c7eb5ff175bfe052448b00dc3dbb5371674d9f59 Mon Sep 17 00:00:00 2001 From: crystal Date: Mon, 29 Apr 2024 00:07:28 -0600 Subject: [PATCH 12/35] fix forgejo-bin deps and conflicts --- deb/.forgejo-bin.control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deb/.forgejo-bin.control b/deb/.forgejo-bin.control index 3f2de6f..5c093a2 100644 --- a/deb/.forgejo-bin.control +++ b/deb/.forgejo-bin.control @@ -2,7 +2,7 @@ Package: forgejo-bin Architecture: amd64 Priority: optional Provides: forgejo,gitea -Depends: adduser (>= 3.11) -Conflicts: forgejo,forgejo-bin +Depends: adduser (>= 3.11), git +Conflicts: forgejo,forgejo-sqlite,forgejo-common Description: Forgejo: Beyond Coding. We Forge. (binary) The official Forgejo release binary in a Debian package From f5324546129fbd98e42ca98811c34cf23bda40d3 Mon Sep 17 00:00:00 2001 From: crystal Date: Mon, 29 Apr 2024 01:52:58 -0600 Subject: [PATCH 13/35] change GITEA_ to FORGEJO_ in env vars --- .ci-make.sh | 4 ++-- deb/forgejo.service | 2 +- etc/systemd/system/forgejo.service.d/override.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci-make.sh b/.ci-make.sh index 5e471ab..8755a80 100755 --- a/.ci-make.sh +++ b/.ci-make.sh @@ -186,7 +186,7 @@ case "$1" in [ -z "$FORGEJO_HOME" ] && FORGEJO_HOME=/var/lib/forgejo [ -z "$FORGEJO_USER" ] && FORGEJO_USER=forgejo sudo -u $FORGEJO_USER USER=$FORGEJO_USER \ - HOME=$FORGEJO_HOME GITEA_WORK_DIR=$FORGEJO_HOME \ + HOME=$FORGEJO_HOME FORGEJO_WORK_DIR=$FORGEJO_HOME \ forgejo web -q --config /etc/forgejo/app.ini & sleep 10 curl http://localhost:3000/ | grep -A 4 "Powered by Forgejo" @@ -202,7 +202,7 @@ case "$1" in apt update -qq apt install -y "$3" sudo -u forgejo USER=forgejo \ - HOME=/var/lib/forgejo GITEA_WORK_DIR=/var/lib/forgejo \ + HOME=/var/lib/forgejo FORGEJO_WORK_DIR=/var/lib/forgejo \ forgejo web -q --config /etc/fogejo/app.ini & sleep 10 curl http://localhost:3000/ | grep -A 4 "Powered by Forgejo" diff --git a/deb/forgejo.service b/deb/forgejo.service index 008d93e..c5f3bc8 100644 --- a/deb/forgejo.service +++ b/deb/forgejo.service @@ -61,7 +61,7 @@ WorkingDirectory=~ #RuntimeDirectory=forgejo ExecStart=/usr/bin/forgejo web --config /etc/forgejo/app.ini Restart=always -Environment=USER=forgejo HOME=/var/lib/forgejo GITEA_WORK_DIR=/var/lib/forgejo +Environment=USER=forgejo HOME=/var/lib/forgejo FORGEJO_WORK_DIR=/var/lib/forgejo # If you install Git to directory prefix other than default PATH (which happens # for example if you install other versions of Git side-to-side with # distribution version), uncomment below line and add that prefix to PATH diff --git a/etc/systemd/system/forgejo.service.d/override.conf b/etc/systemd/system/forgejo.service.d/override.conf index f626df8..02635f5 100644 --- a/etc/systemd/system/forgejo.service.d/override.conf +++ b/etc/systemd/system/forgejo.service.d/override.conf @@ -3,4 +3,4 @@ # LimitNOFILE=524288:524288 User=git Group=git -Environment=USER=git HOME=/var/lib/forgejo GITEA_WORK_DIR=/var/lib/forgejo +Environment=USER=git HOME=/var/lib/forgejo FORGEJO_WORK_DIR=/var/lib/forgejo From f985489b7058cc2d0b57ba861d1b81546f803993 Mon Sep 17 00:00:00 2001 From: crystal Date: Wed, 1 May 2024 17:58:21 -0600 Subject: [PATCH 14/35] better tag fetching in addition to using the checkout action for all the fetches, this will make sure we get a deep clone of the repository that can be used to resolve tags for pull requests if the submodule is ahead of the latest tag in the main origin --- .forgejo/workflows/forgejo-deb.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/forgejo-deb.yml b/.forgejo/workflows/forgejo-deb.yml index 1c66728..7567e04 100644 --- a/.forgejo/workflows/forgejo-deb.yml +++ b/.forgejo/workflows/forgejo-deb.yml @@ -20,6 +20,9 @@ jobs: - uses: actions/checkout@v4 with: submodules: true + fetch-depth: 0 + fetch-tags: true + filter: tree:0 - uses: actions/setup-node@v3 with: @@ -34,12 +37,6 @@ jobs: id: ciprep run: ./.ci-make.sh actions-prep build-forgejo-deb - - name: fetch tags - run: | - git config --add safe.directory '*' - git fetch --tags --force - git submodule foreach 'git fetch --tags --force' - - uses: crystal/install-jq-action@v2.1.0 - run: ./.ci-make.sh ci-verify forgejo From 2cbc8603ba9dbe47df6ffb9bde07e1abcea58aef Mon Sep 17 00:00:00 2001 From: crystal Date: Wed, 1 May 2024 19:57:10 -0600 Subject: [PATCH 15/35] Support downloading binaries for experimental releases This is a minor enhancement that allows the forgejo-bin package to match the others, specifically when building a pull request for an official Forgejo version that hasn't yet been released. --- .ci-make.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.ci-make.sh b/.ci-make.sh index 8755a80..5e537e4 100755 --- a/.ci-make.sh +++ b/.ci-make.sh @@ -95,7 +95,18 @@ case "$1" in if [ ! $CI_COMMIT_TAG_RESOLVE ] ; then echo "Failed to resolve exact tag! Getting as close as we can..." git describe --tags HEAD - CI_COMMIT_TAG_RESOLVE=$(git describe --tags HEAD --abbrev=0) + FORGEJO_CLOSEST_TAG=$(git describe --tags HEAD --abbrev=0) + echo "Looking for experimental tag..." + EXPERIMENTAL_REPO="forgejo-experimental/forgejo" + git remote add experimental $CI_VERIFY_API/$EXPERIMENTAL_REPO + git fetch experimental --tags + CI_COMMIT_TAG_RESOLVE=$(git tag --points-at HEAD) + if [ $CI_COMMIT_TAG_RESOLVE ] ; then + CI_VERIFY_REPO=$EXPERIMENTAL_REPO + FORGEJO_CLOSEST_TAG=$CI_COMMIT_TAG_RESOLVE + echo "Found it! Using experimental tag and downloading binary from $CI_VERIFY_REPO" + fi + CI_COMMIT_TAG_RESOLVE=$FORGEJO_CLOSEST_TAG echo "Closest existing tag: $CI_COMMIT_TAG_RESOLVE" if [ "$CI_COMMIT_TAG_RESOLVE" != "${CI_COMMIT_TAG_RESOLVE%"-dev"}" ] || [ ! "$CI_COMMIT_TAG_RESOLVE" ] ; then if [ $PR_MODE ] ; then From 7fcc7721f8d9dc44f79451841abde6ccd450a114 Mon Sep 17 00:00:00 2001 From: Moritz Kobel Date: Fri, 5 Jul 2024 22:04:46 +0200 Subject: [PATCH 16/35] Forgejo v7.0.5 --- deb/debian/changelog | 7 +++++++ forgejo | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/deb/debian/changelog b/deb/debian/changelog index 8a9a4f9..f383adc 100644 --- a/deb/debian/changelog +++ b/deb/debian/changelog @@ -1,3 +1,10 @@ +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 + + -- mkobel Fri, 05 July 2024 22:03:00 +0200 + forgejo (7.0.1-1) unstable; urgency=medium * Forgejo version 7.0.1 diff --git a/forgejo b/forgejo index 554f369..65a89ce 160000 --- a/forgejo +++ b/forgejo @@ -1 +1 @@ -Subproject commit 554f3697fc4519b44fb583925259db97eb3a8f5b +Subproject commit 65a89ce6be62018ea50cb01c080072973ce87efb From b5914277d3021ce5b73ce1f4fb8ec16257e614f2 Mon Sep 17 00:00:00 2001 From: crystal Date: Mon, 29 Apr 2024 04:30:06 -0600 Subject: [PATCH 17/35] [squash] split common data instead of building the packaged binaries with the `bindata` tag, this introduces a new forgejo-common package which contains common assets and architecture independent files. This is the first of a handful of PRs that will ultimately enable building packages for multiple architectures. --- .ci-make.sh | 37 +++++++++++++++---- .forgejo/workflows/forgejo-deb.yml | 4 +- deb/.forgejo-bin.control | 4 +- deb/debian/NEWS | 2 +- deb/debian/changelog | 4 +- deb/debian/control | 18 ++++++--- deb/debian/forgejo-common.install | 5 +++ ...forgejo.preinst => forgejo-common.preinst} | 0 deb/debian/forgejo-sqlite.install | 2 - deb/debian/forgejo-sqlite.preinst | 1 - deb/debian/forgejo.install | 2 - 11 files changed, 54 insertions(+), 25 deletions(-) create mode 100644 deb/debian/forgejo-common.install rename deb/debian/{forgejo.preinst => forgejo-common.preinst} (100%) delete mode 120000 deb/debian/forgejo-sqlite.preinst diff --git a/.ci-make.sh b/.ci-make.sh index 5e537e4..a1dfce0 100755 --- a/.ci-make.sh +++ b/.ci-make.sh @@ -8,6 +8,10 @@ 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" @@ -145,11 +149,14 @@ 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.preinst deb/debian/forgejo-bin.preinst + ln -s forgejo-common.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 @@ -192,13 +199,27 @@ case "$1" in "install-run-test") export DEBIAN_FRONTEND=noninteractive apt update - apt install -y ./"$2" - [ -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 & + if [ "$2" = "${2#"./forgejo-bin_"}" ] ; then + APT_FORGEJO_COMMON_RESOLVE="$(ls -1 ./forgejo-common_*_all.deb)" + if [ -f "$APT_FORGEJO_COMMON_RESOLVE" ] ; then + APT_FORGEJO_COMMON="./$APT_FORGEJO_COMMON_RESOLVE" + else + echo "ERR! Unable to find the necessary forgejo-common package!" + exit 96 + 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 $? diff --git a/.forgejo/workflows/forgejo-deb.yml b/.forgejo/workflows/forgejo-deb.yml index 7567e04..1031a38 100644 --- a/.forgejo/workflows/forgejo-deb.yml +++ b/.forgejo/workflows/forgejo-deb.yml @@ -59,13 +59,11 @@ jobs: - name: Build Forgejo for amd64 run: ./.ci-make.sh submodule-build forgejo forgejo-bin - env: - TAGS: bindata - name: Build Forgejo (with SQLite) for amd64 run: ./.ci-make.sh submodule-build forgejo forgejo-sqlite-bin env: - TAGS: bindata sqlite sqlite_unlock_notify + TAGS: sqlite sqlite_unlock_notify - run: ./.ci-make.sh package-prep - run: ./.ci-make.sh package-build-deps diff --git a/deb/.forgejo-bin.control b/deb/.forgejo-bin.control index 5c093a2..ead2966 100644 --- a/deb/.forgejo-bin.control +++ b/deb/.forgejo-bin.control @@ -1,8 +1,8 @@ Package: forgejo-bin Architecture: amd64 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 diff --git a/deb/debian/NEWS b/deb/debian/NEWS index ef3b3ff..e24bf94 100644 --- a/deb/debian/NEWS +++ b/deb/debian/NEWS @@ -1,4 +1,4 @@ -forgejo (7.0.1-1) unstable; urgency=medium +forgejo (7.0.1-2) unstable; urgency=medium WARNING: Forgejo will be upgraded to v7.0.1 LTS diff --git a/deb/debian/changelog b/deb/debian/changelog index f383adc..da71ac3 100644 --- a/deb/debian/changelog +++ b/deb/debian/changelog @@ -2,13 +2,15 @@ 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 - -- mkobel Fri, 05 July 2024 22:03:00 +0200 + -- crystal Sun, 07 July 2024 17:22:00 +0000 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 Sat, 27 Apr 2024 15:35:00 +0000 diff --git a/deb/debian/control b/deb/debian/control index 323d688..ae16460 100644 --- a/deb/debian/control +++ b/deb/debian/control @@ -8,16 +8,24 @@ Package: forgejo Architecture: amd64 Priority: optional Provides: gitea -Depends: adduser (>= 3.11),git -Conflicts: forgejo-sqlite,forgejo-bin +Depends: forgejo-common (= ${source:Version}), 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 Package: forgejo-sqlite Architecture: amd64 Priority: optional -Provides: forgejo,gitea -Depends: adduser (>= 3.11),git -Conflicts: forgejo,forgejo-bin +Provides: forgejo, gitea +Depends: forgejo-common (= ${source:Version}), 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 + +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. diff --git a/deb/debian/forgejo-common.install b/deb/debian/forgejo-common.install new file mode 100644 index 0000000..5904930 --- /dev/null +++ b/deb/debian/forgejo-common.install @@ -0,0 +1,5 @@ +public/ /usr/share/forgejo +templates/ /usr/share/forgejo +options/ /usr/share/forgejo +forgejo.service /usr/lib/systemd/system +app.ini /etc/forgejo diff --git a/deb/debian/forgejo.preinst b/deb/debian/forgejo-common.preinst similarity index 100% rename from deb/debian/forgejo.preinst rename to deb/debian/forgejo-common.preinst diff --git a/deb/debian/forgejo-sqlite.install b/deb/debian/forgejo-sqlite.install index 7a55675..106c3c8 100644 --- a/deb/debian/forgejo-sqlite.install +++ b/deb/debian/forgejo-sqlite.install @@ -1,3 +1 @@ forgejo-sqlite-bin/forgejo /usr/bin -forgejo.service /usr/lib/systemd/system -app.ini /etc/forgejo diff --git a/deb/debian/forgejo-sqlite.preinst b/deb/debian/forgejo-sqlite.preinst deleted file mode 120000 index c9dce9a..0000000 --- a/deb/debian/forgejo-sqlite.preinst +++ /dev/null @@ -1 +0,0 @@ -forgejo.preinst \ No newline at end of file diff --git a/deb/debian/forgejo.install b/deb/debian/forgejo.install index 6440cb3..db18dc4 100644 --- a/deb/debian/forgejo.install +++ b/deb/debian/forgejo.install @@ -1,3 +1 @@ forgejo-bin/forgejo /usr/bin -forgejo.service /usr/lib/systemd/system -app.ini /etc/forgejo From 6b49ead003d0c6e4877c04c2cd2bee641ecb01c9 Mon Sep 17 00:00:00 2001 From: crystal Date: Sun, 25 Aug 2024 19:00:20 -0600 Subject: [PATCH 18/35] Forgejo v7.0.7 --- deb/debian/changelog | 8 ++++++++ forgejo | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/deb/debian/changelog b/deb/debian/changelog index da71ac3..fdcd1aa 100644 --- a/deb/debian/changelog +++ b/deb/debian/changelog @@ -1,3 +1,11 @@ +forgejo (7.0.7-1) unstable; urgency=medium + + * Forgejo version 7.0.7 + * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#7-0-7 + * Split `forgejo-common` package for extra data + + -- crystal Mon, 26 Aug 2024 00:55:00 +0000 + forgejo (7.0.5-1) unstable; urgency=medium * Forgejo version 7.0.5 diff --git a/forgejo b/forgejo index 65a89ce..29afb54 160000 --- a/forgejo +++ b/forgejo @@ -1 +1 @@ -Subproject commit 65a89ce6be62018ea50cb01c080072973ce87efb +Subproject commit 29afb54dafab1533a0be696f47a61f26fcf3be96 From dff00b2c123da6b5fe65aa8223ebc6c44a9bd101 Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Tue, 27 Aug 2024 09:58:27 +0200 Subject: [PATCH 19/35] Forgejo v8.0.1 --- deb/debian/changelog | 8 ++++++++ forgejo | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/deb/debian/changelog b/deb/debian/changelog index fdcd1aa..2277a60 100644 --- a/deb/debian/changelog +++ b/deb/debian/changelog @@ -1,3 +1,11 @@ +forgejo (8.0.1-1) unstable; urgency=medium + + * Forgejo version 8.0.1 + * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#8.0.1 + * Split `forgejo-common` package for extra data + + -- crystal Mon, 27 Aug 2024 00:55:00 +0000 + forgejo (7.0.7-1) unstable; urgency=medium * Forgejo version 7.0.7 diff --git a/forgejo b/forgejo index 29afb54..4d0be86 160000 --- a/forgejo +++ b/forgejo @@ -1 +1 @@ -Subproject commit 29afb54dafab1533a0be696f47a61f26fcf3be96 +Subproject commit 4d0be867a22caccf38c1a776de5502a43dedcf02 From 0e0d010347b2ba481109c7c345894c7873746a37 Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Sun, 1 Sep 2024 19:18:13 +0200 Subject: [PATCH 20/35] Forgejo v8.0.2 --- deb/debian/changelog | 8 ++++++++ forgejo | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/deb/debian/changelog b/deb/debian/changelog index 2277a60..519f93c 100644 --- a/deb/debian/changelog +++ b/deb/debian/changelog @@ -1,3 +1,11 @@ +forgejo (8.0.2-1) unstable; urgency=medium + + * Forgejo version 8.0.2 + * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#8.0.2 + * Split `forgejo-common` package for extra data + + -- crystal Sun, 01 Sep 2024 00:55:00 +0000 + forgejo (8.0.1-1) unstable; urgency=medium * Forgejo version 8.0.1 diff --git a/forgejo b/forgejo index 4d0be86..949e415 160000 --- a/forgejo +++ b/forgejo @@ -1 +1 @@ -Subproject commit 4d0be867a22caccf38c1a776de5502a43dedcf02 +Subproject commit 949e415fd3c90f771c34195312ae74735f760add From 8c50d64e5d1d3ba70a2f114d829f4df6b19ae578 Mon Sep 17 00:00:00 2001 From: Jeff MrBear Date: Sun, 15 Sep 2024 19:40:07 +0200 Subject: [PATCH 21/35] Forgejo v8.0.3 --- deb/debian/changelog | 10 +++++++++- forgejo | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/deb/debian/changelog b/deb/debian/changelog index 519f93c..268c641 100644 --- a/deb/debian/changelog +++ b/deb/debian/changelog @@ -1,3 +1,11 @@ +forgejo (8.0.3-1) unstable; urgency=medium + + * Forgejo version 8.0.3 + * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#8.0.3 + * Split `forgejo-common` package for extra data + + -- crystal Sun, 15 Sep 2024 00:55:00 +0000 + forgejo (8.0.2-1) unstable; urgency=medium * Forgejo version 8.0.2 @@ -12,7 +20,7 @@ forgejo (8.0.1-1) unstable; urgency=medium * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#8.0.1 * Split `forgejo-common` package for extra data - -- crystal Mon, 27 Aug 2024 00:55:00 +0000 + -- crystal Tue, 27 Aug 2024 00:55:00 +0000 forgejo (7.0.7-1) unstable; urgency=medium diff --git a/forgejo b/forgejo index 949e415..71658e2 160000 --- a/forgejo +++ b/forgejo @@ -1 +1 @@ -Subproject commit 949e415fd3c90f771c34195312ae74735f760add +Subproject commit 71658e29530f275db8f4a431387d334af8e80677 From eebd057bf600f0cd84ebf3dc346fd2bec208cc4c Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Tue, 8 Oct 2024 16:43:26 +0200 Subject: [PATCH 22/35] testing repo hosting --- .action-forgejo-mirror.sh | 7 ------- .forgejo/workflows/forgejo-deb.yml | 31 +++++------------------------- 2 files changed, 5 insertions(+), 33 deletions(-) delete mode 100755 .action-forgejo-mirror.sh diff --git a/.action-forgejo-mirror.sh b/.action-forgejo-mirror.sh deleted file mode 100755 index 84df16c..0000000 --- a/.action-forgejo-mirror.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -git fetch --tags -git remote add action-forgejo-mirror https://action-forgejo-mirror:$FORGEJO_KEY@$FORGEJO_DEST/$GITHUB_REPOSITORY -git push action-forgejo-mirror --all -git push action-forgejo-mirror --tags "refs/remotes/origin/*:refs/heads/*" -git remote remove action-forgejo-mirror diff --git a/.forgejo/workflows/forgejo-deb.yml b/.forgejo/workflows/forgejo-deb.yml index 1031a38..bc69514 100644 --- a/.forgejo/workflows/forgejo-deb.yml +++ b/.forgejo/workflows/forgejo-deb.yml @@ -1,19 +1,5 @@ on: [push, pull_request] jobs: - mirror: - runs-on: bookworm - if: github.event_name == 'push' && github.repository == 'forgejo-contrib/forgejo-deb' - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: "mirror repo: code.forgejo.org" - env: - FORGEJO_DEST: code.forgejo.org - FORGEJO_KEY: ${{ secrets.cfo_api_key }} - run: ./.action-forgejo-mirror.sh - build-forgejo-deb: runs-on: bullseye steps: @@ -203,27 +189,20 @@ jobs: - uses: crystal/install-jq-action@v2.1.0 - run: mkdir forgejo-release - run: mv *.deb *.deb.sha256 forgejo-release/ - - - uses: actions/forgejo-release@v1 - with: - direction: upload - url: https://codeberg.org - token: ${{ secrets.codeberg_api_key }} - release-dir: forgejo-release - uses: actions/forgejo-release@v1 with: direction: upload - url: https://code.forgejo.org + url: https://forgejo.glicid.fr token: ${{ secrets.cfo_api_key }} release-dir: forgejo-release - name: Debian package registry publish env: - FORGEJO_SITE: https://code.forgejo.org - FORGEJO_OWNER: forgejo-contrib - DEBIAN_DIST: bullseye - DEBIAN_COMPONENT: forgejo-lts + FORGEJO_SITE: https://forgejo.glicid.fr + FORGEJO_OWNER: GLiCID + DEBIAN_DIST: bookworm + DEBIAN_COMPONENT: forgejo FORGEJO_KEY: ${{ secrets.cfo_api_key }} run: | cd forgejo-release From 83e018f3dd165d2be48070583d3e374b9b8f4d8d Mon Sep 17 00:00:00 2001 From: "guillaume-jf_univ-nantes.fr" Date: Tue, 8 Oct 2024 17:27:37 +0200 Subject: [PATCH 23/35] Update .forgejo/workflows/forgejo-deb.yml --- .forgejo/workflows/forgejo-deb.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.forgejo/workflows/forgejo-deb.yml b/.forgejo/workflows/forgejo-deb.yml index bc69514..f08db4a 100644 --- a/.forgejo/workflows/forgejo-deb.yml +++ b/.forgejo/workflows/forgejo-deb.yml @@ -80,6 +80,8 @@ jobs: installtest-bookworm-sqlite: runs-on: bookworm + needs: + - build-forgejo-deb steps: - uses: actions/checkout@v4 @@ -95,6 +97,8 @@ jobs: installtest-bullseye-sqlite: runs-on: bullseye + needs: + - build-forgejo-deb steps: - uses: actions/checkout@v4 @@ -110,6 +114,8 @@ jobs: installtest-buster-sqlite: runs-on: buster + needs: + - build-forgejo-deb steps: - uses: actions/checkout@v4 @@ -125,6 +131,8 @@ jobs: installtest-bookworm-user: runs-on: bookworm + needs: + - build-forgejo-deb steps: - uses: actions/checkout@v4 @@ -141,6 +149,8 @@ jobs: testsuite-repo-upgrade-sqlite: runs-on: bookworm + needs: + - build-forgejo-deb steps: - uses: actions/checkout@v4 @@ -159,6 +169,8 @@ jobs: installtest-buster-bin: runs-on: buster + needs: + - build-forgejo-deb steps: - uses: actions/checkout@v4 @@ -174,6 +186,8 @@ jobs: publish-release-repo: runs-on: bookworm + needs: + - build-forgejo-deb if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') && github.repository == 'forgejo-contrib/forgejo-deb' steps: - uses: actions/checkout@v4 From 9bbc6bd6d67905fc6ac851c91c85498802658357 Mon Sep 17 00:00:00 2001 From: "guillaume-jf_univ-nantes.fr" Date: Tue, 8 Oct 2024 17:57:41 +0200 Subject: [PATCH 24/35] Update .forgejo/workflows/forgejo-deb.yml --- .forgejo/workflows/forgejo-deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/forgejo-deb.yml b/.forgejo/workflows/forgejo-deb.yml index f08db4a..d36423a 100644 --- a/.forgejo/workflows/forgejo-deb.yml +++ b/.forgejo/workflows/forgejo-deb.yml @@ -188,7 +188,7 @@ jobs: runs-on: bookworm needs: - build-forgejo-deb - if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') && github.repository == 'forgejo-contrib/forgejo-deb' + if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') && github.repository == 'GLiCID/forgejo-deb' steps: - uses: actions/checkout@v4 From fd4a84f5090bc695335cb82b4d9f0005ae0a035b Mon Sep 17 00:00:00 2001 From: "guillaume-jf_univ-nantes.fr" Date: Tue, 8 Oct 2024 18:13:00 +0200 Subject: [PATCH 25/35] Update .forgejo/workflows/forgejo-deb.yml --- .forgejo/workflows/forgejo-deb.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.forgejo/workflows/forgejo-deb.yml b/.forgejo/workflows/forgejo-deb.yml index d36423a..31099c8 100644 --- a/.forgejo/workflows/forgejo-deb.yml +++ b/.forgejo/workflows/forgejo-deb.yml @@ -188,7 +188,6 @@ jobs: runs-on: bookworm needs: - build-forgejo-deb - if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') && github.repository == 'GLiCID/forgejo-deb' steps: - uses: actions/checkout@v4 From 7464db27e31769b0a455e37e0bb0b842e0cf8bc2 Mon Sep 17 00:00:00 2001 From: "guillaume-jf_univ-nantes.fr" Date: Tue, 8 Oct 2024 18:56:54 +0200 Subject: [PATCH 26/35] Update .forgejo/workflows/forgejo-deb.yml --- .forgejo/workflows/forgejo-deb.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/forgejo-deb.yml b/.forgejo/workflows/forgejo-deb.yml index 31099c8..5a626cc 100644 --- a/.forgejo/workflows/forgejo-deb.yml +++ b/.forgejo/workflows/forgejo-deb.yml @@ -207,7 +207,7 @@ jobs: with: direction: upload url: https://forgejo.glicid.fr - token: ${{ secrets.cfo_api_key }} + token: ${{ secrets.CFO_API_KEY }} release-dir: forgejo-release - name: Debian package registry publish @@ -216,7 +216,7 @@ jobs: FORGEJO_OWNER: GLiCID DEBIAN_DIST: bookworm DEBIAN_COMPONENT: forgejo - FORGEJO_KEY: ${{ secrets.cfo_api_key }} + FORGEJO_KEY: ${{ secrets.CFO_API_KEY }} run: | cd forgejo-release ../.ci-forgejo-apt.sh *.deb From 246b511dbddc6969226fd4ece0d9ce5bfb71283e Mon Sep 17 00:00:00 2001 From: "guillaume-jf_univ-nantes.fr" Date: Tue, 8 Oct 2024 19:39:30 +0200 Subject: [PATCH 27/35] Update .forgejo/workflows/forgejo-deb.yml --- .forgejo/workflows/forgejo-deb.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/forgejo-deb.yml b/.forgejo/workflows/forgejo-deb.yml index 5a626cc..51e0a96 100644 --- a/.forgejo/workflows/forgejo-deb.yml +++ b/.forgejo/workflows/forgejo-deb.yml @@ -203,12 +203,12 @@ jobs: - run: mkdir forgejo-release - run: mv *.deb *.deb.sha256 forgejo-release/ - - uses: actions/forgejo-release@v1 - with: - direction: upload - url: https://forgejo.glicid.fr - token: ${{ secrets.CFO_API_KEY }} - release-dir: forgejo-release +# - uses: actions/forgejo-release@v1 +# with: +# direction: upload +# url: https://forgejo.glicid.fr +# token: ${{ secrets.CFO_API_KEY }} +# release-dir: forgejo-release - name: Debian package registry publish env: From 4f28b03d5f095262c148cb38bb44c98c2f92d497 Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Thu, 28 Nov 2024 16:31:27 +0100 Subject: [PATCH 28/35] Forgejo v9.0.2 --- deb/debian/changelog | 9 +++++++++ forgejo | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/deb/debian/changelog b/deb/debian/changelog index 268c641..b07eeb6 100644 --- a/deb/debian/changelog +++ b/deb/debian/changelog @@ -1,3 +1,12 @@ +forgejo (9.0.2-1) unstable; urgency=medium + + * Forgejo version 9.0.2 + * See + https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#9.0.2 + * Split `forgejo-common` package for extra data + + -- crystal Thu, 28 Nov 2024 00:55:00 +0000 + forgejo (8.0.3-1) unstable; urgency=medium * Forgejo version 8.0.3 diff --git a/forgejo b/forgejo index 71658e2..6569f1f 160000 --- a/forgejo +++ b/forgejo @@ -1 +1 @@ -Subproject commit 71658e29530f275db8f4a431387d334af8e80677 +Subproject commit 6569f1f25fd428adf14368ce5ad50d8049df788b From fbdc464a9b811c556331dc196d18df283e6f3d05 Mon Sep 17 00:00:00 2001 From: "guillaume-jf_univ-nantes.fr" Date: Sun, 1 Dec 2024 09:26:26 +0100 Subject: [PATCH 29/35] update go version to 1.23 --- .forgejo/workflows/forgejo-deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/forgejo-deb.yml b/.forgejo/workflows/forgejo-deb.yml index 51e0a96..c27b025 100644 --- a/.forgejo/workflows/forgejo-deb.yml +++ b/.forgejo/workflows/forgejo-deb.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-go@v4 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - name: "actions prep: build-forgejo-deb" From ed28da0d2c51f25a379de580d486936512d0088e Mon Sep 17 00:00:00 2001 From: Jeff MrBear Date: Sat, 14 Dec 2024 12:56:25 +0100 Subject: [PATCH 30/35] Forgejo v9.0.3 --- deb/debian/changelog | 9 +++++++++ forgejo | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/deb/debian/changelog b/deb/debian/changelog index b07eeb6..1991a8a 100644 --- a/deb/debian/changelog +++ b/deb/debian/changelog @@ -1,3 +1,12 @@ +forgejo (9.0.3-1) unstable; urgency=medium + + * Forgejo version 9.0.3 + * See + https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#9.0.3 + * Split `forgejo-common` package for extra data + + -- crystal Sat, 14 Dec 2024 00:55:00 +0000 + forgejo (9.0.2-1) unstable; urgency=medium * Forgejo version 9.0.2 diff --git a/forgejo b/forgejo index 6569f1f..d595393 160000 --- a/forgejo +++ b/forgejo @@ -1 +1 @@ -Subproject commit 6569f1f25fd428adf14368ce5ad50d8049df788b +Subproject commit d595393bb619d5fafe16b38d15aa004256a414df From c541fd518d7345fd9e664c7b722785b67eaf6dd6 Mon Sep 17 00:00:00 2001 From: Jeff MrBear Date: Sun, 19 Jan 2025 11:01:48 +0100 Subject: [PATCH 31/35] Forgejo v10.0.0 --- deb/debian/changelog | 24 +++++++++++++++++++----- forgejo | 2 +- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/deb/debian/changelog b/deb/debian/changelog index 1991a8a..b2f760e 100644 --- a/deb/debian/changelog +++ b/deb/debian/changelog @@ -1,8 +1,15 @@ +forgejo (10.0.0-1) unstable; urgency=medium + + * Forgejo version 10.0.0 + * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#10.0.0 + * Split `forgejo-common` package for extra data + + -- crystal Sun, 19 Dec 2025 00:55:00 +0000 + forgejo (9.0.3-1) unstable; urgency=medium * Forgejo version 9.0.3 - * See - https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#9.0.3 + * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#9.0.3 * Split `forgejo-common` package for extra data -- crystal Sat, 14 Dec 2024 00:55:00 +0000 @@ -10,11 +17,18 @@ forgejo (9.0.3-1) unstable; urgency=medium forgejo (9.0.2-1) unstable; urgency=medium * Forgejo version 9.0.2 - * See - https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#9.0.2 + * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#9.0.2 * Split `forgejo-common` package for extra data - -- crystal Thu, 28 Nov 2024 00:55:00 +0000 + -- crystal Sat, 14 Dec 2024 00:55:00 +0000 + +forgejo (9.0.1-1) unstable; urgency=medium + + * Forgejo version 9.0.1 + * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#9.0.1 + * Split `forgejo-common` package for extra data + + -- crystal Mon, 28 Oct 2024 00:55:00 +0000 forgejo (8.0.3-1) unstable; urgency=medium diff --git a/forgejo b/forgejo index d595393..39843ee 160000 --- a/forgejo +++ b/forgejo @@ -1 +1 @@ -Subproject commit d595393bb619d5fafe16b38d15aa004256a414df +Subproject commit 39843ee2b33ea9f3c95112cd306462d350b93d32 From ce179fd76f19b53a6a5a5779188cb77933424896 Mon Sep 17 00:00:00 2001 From: Jeff MrBear Date: Mon, 17 Feb 2025 15:18:14 +0100 Subject: [PATCH 32/35] Forgejo v10.0.1 --- deb/debian/changelog | 8 ++++++++ forgejo | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/deb/debian/changelog b/deb/debian/changelog index b2f760e..5bbec15 100644 --- a/deb/debian/changelog +++ b/deb/debian/changelog @@ -1,3 +1,11 @@ +forgejo (10.0.1-1) unstable; urgency=medium + + * Forgejo version 10.0.1 + * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#10.0.1 + * Split `forgejo-common` package for extra data + + -- crystal Mon, 17 Feb 2025 00:55:00 +0000 + forgejo (10.0.0-1) unstable; urgency=medium * Forgejo version 10.0.0 diff --git a/forgejo b/forgejo index 39843ee..6ef9008 160000 --- a/forgejo +++ b/forgejo @@ -1 +1 @@ -Subproject commit 39843ee2b33ea9f3c95112cd306462d350b93d32 +Subproject commit 6ef900899e9d5d9cf45c5fc7ce77649aa8368365 From b0182b90256dbebf1806dc214ccd6c5e34bbf513 Mon Sep 17 00:00:00 2001 From: Jeff MrBear Date: Sat, 29 Mar 2025 08:42:12 +0100 Subject: [PATCH 33/35] Forgejo v10.0.2 --- deb/debian/changelog | 6 ++++++ forgejo | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/deb/debian/changelog b/deb/debian/changelog index 5bbec15..695cd7f 100644 --- a/deb/debian/changelog +++ b/deb/debian/changelog @@ -1,3 +1,9 @@ +forgejo (10.0.2-1) unstable; urgency=medium + + * Forgejo version 10.0.2 + * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#10.0.2 + * Split `forgejo-common` package for extra data + forgejo (10.0.1-1) unstable; urgency=medium * Forgejo version 10.0.1 diff --git a/forgejo b/forgejo index 6ef9008..5ec1f7f 160000 --- a/forgejo +++ b/forgejo @@ -1 +1 @@ -Subproject commit 6ef900899e9d5d9cf45c5fc7ce77649aa8368365 +Subproject commit 5ec1f7f3639639a4d54c720c075121e4de6b9755 From 6c25846bab05338d28063d4cba33ebfb578ca14a Mon Sep 17 00:00:00 2001 From: Jeff MrBear Date: Sat, 29 Mar 2025 08:45:06 +0100 Subject: [PATCH 34/35] Forgejo v10.0.3 --- deb/debian/changelog | 10 ++++++++++ forgejo | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/deb/debian/changelog b/deb/debian/changelog index 695cd7f..0ef3c93 100644 --- a/deb/debian/changelog +++ b/deb/debian/changelog @@ -1,9 +1,19 @@ +forgejo (10.0.3-1) unstable; urgency=medium + + * Forgejo version 10.0.3 + * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#10.0.3 + * Split `forgejo-common` package for extra data + + -- crystal Sat, 29 Mar 2025 00:55:00 +0000 + forgejo (10.0.2-1) unstable; urgency=medium * Forgejo version 10.0.2 * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#10.0.2 * Split `forgejo-common` package for extra data + -- crystal Sat, 29 Mar 2025 00:55:00 +0000 + forgejo (10.0.1-1) unstable; urgency=medium * Forgejo version 10.0.1 diff --git a/forgejo b/forgejo index 5ec1f7f..dde3f51 160000 --- a/forgejo +++ b/forgejo @@ -1 +1 @@ -Subproject commit 5ec1f7f3639639a4d54c720c075121e4de6b9755 +Subproject commit dde3f51c72feffac4805fc3133b6a681d8c97c6f From 7403d0da0e314686449032b4e4096f1623708510 Mon Sep 17 00:00:00 2001 From: Jeff MrBear Date: Wed, 30 Apr 2025 11:39:14 +0200 Subject: [PATCH 35/35] Forgejo v11.0.0 --- .forgejo/workflows/forgejo-deb.yml | 2 +- deb/debian/changelog | 8 ++++++++ forgejo | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/forgejo-deb.yml b/.forgejo/workflows/forgejo-deb.yml index c27b025..99dce7e 100644 --- a/.forgejo/workflows/forgejo-deb.yml +++ b/.forgejo/workflows/forgejo-deb.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-go@v4 with: - go-version: "1.23" + go-version: "1.24" check-latest: true - name: "actions prep: build-forgejo-deb" diff --git a/deb/debian/changelog b/deb/debian/changelog index 0ef3c93..562ada8 100644 --- a/deb/debian/changelog +++ b/deb/debian/changelog @@ -1,3 +1,11 @@ +forgejo (11.0.0-1) unstable; urgency=medium + + * Forgejo version 11.0.0 + * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#11.0.0 + * Split `forgejo-common` package for extra data + + -- crystal Wed, 30 Apr 2025 00:55:00 +0000 + forgejo (10.0.3-1) unstable; urgency=medium * Forgejo version 10.0.3 diff --git a/forgejo b/forgejo index dde3f51..308810c 160000 --- a/forgejo +++ b/forgejo @@ -1 +1 @@ -Subproject commit dde3f51c72feffac4805fc3133b6a681d8c97c6f +Subproject commit 308810cdd17e3edf928d38c5d410acf2c7aa7618