complex partial revert #33

reverts most of 5e142ef06c
0aedcd394d will need another complex revert
This commit is contained in:
crystal 2024-04-28 11:58:09 -06:00
parent 5e142ef06c
commit 2907295f72
No known key found for this signature in database
GPG key ID: 1122054731F7CC43
9 changed files with 33 additions and 16 deletions

View file

@ -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

View file

@ -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

View file

@ -0,0 +1 @@
deb https://code.forgejo.org/api/packages/forgejo-contrib/debian bullseye forgejo forgejo-lts

View file

@ -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 <crystal@noreply.codeberg.org> Sun, 28 Apr 2024 15:00:00 +0000
-- crystal <crystal@noreply.codeberg.org> Sun, 28 Apr 2024 17:48:00 +0000

View file

@ -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 <crystal@noreply.codeberg.org> Sun, 28 Apr 2024 14:59:00 +0000
-- crystal <crystal@noreply.codeberg.org> Sun, 28 Apr 2024 17:48:00 +0000
forgejo-deb-repo (2-2) unstable; urgency=medium

View file

@ -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

View file

@ -0,0 +1 @@
forgejo-deb-lts.list /etc/apt/sources.list.d

View file

@ -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

View file

@ -2,4 +2,4 @@ forgejo-deb-repo (0-0) unstable; urgency=medium
* forgejo-deb APT repository stub
-- crystal <crystal@noreply.codeberg.org> Tue, 25 Jul 2023 10:50:00 +0000
-- crystal <crystal@noreply.codeberg.org> Sun, 28 Jul 2024 15:26:00 +0000