diff options
| -rw-r--r-- | .forgejo/workflows/forgejo-deb.yml | 26 | ||||
| -rwxr-xr-x | repo-deb/build.sh | 3 | ||||
| -rw-r--r-- | repo-deb/forgejo-deb.list_stub | 1 | ||||
| -rw-r--r-- | repo-deb/main/debian/control | 6 | ||||
| -rw-r--r-- | repo-deb/main/debian/forgejo-deb-repo-lts.install | 1 | ||||
| -rw-r--r-- | repo-deb/stub/debian/changelog | 2 |
6 files changed, 3 insertions, 36 deletions
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 <crystal@noreply.codeberg.org> Sun, 28 Jul 2024 15:26:00 +0000 + -- crystal <crystal@noreply.codeberg.org> Tue, 25 Jul 2023 10:50:00 +0000 |