From 43eaa353a8cbd6b8a4ba0f3cbe229a409b2e8a46 Mon Sep 17 00:00:00 2001 From: crystal Date: Sun, 28 Apr 2024 12:33:23 -0600 Subject: [PATCH] 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