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