From 22a152e1881a2d1903a72230eb81267b2add6e6d Mon Sep 17 00:00:00 2001 From: crystal Date: Sun, 28 Apr 2024 10:11:58 -0600 Subject: [PATCH 1/6] [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 2/6] [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 3/6] 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 4/6] 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 5/6] 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 6/6] 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'