Compare commits

..

No commits in common. "main" and "v7.0.1" have entirely different histories.
main ... v7.0.1

20 changed files with 86 additions and 246 deletions

11
.action-forgejo-mirror.sh Executable file
View file

@ -0,0 +1,11 @@
#!/usr/bin/env bash
if [ "$GITHUB_REPOSITORY_OWNER" = "crystal" ] ; then
echo "crystal_pr: skipping mirror!"
exit 0
fi
git fetch --tags
git remote add action-forgejo-mirror https://forgejo-deb:$FORGEJO_KEY@$FORGEJO_DEST/$GITHUB_REPOSITORY
git push action-forgejo-mirror --all
git push action-forgejo-mirror --tags "refs/remotes/origin/*:refs/heads/*"
git remote remove action-forgejo-mirror

View file

@ -8,10 +8,6 @@ CI_VERIFY_RETRY_COUNT=30 # How many times to retry before giving up if the pipel
case "$1" in
"submodule-build")
cd "$2"
LDFLAGS="$LDFLAGS -X \"code.gitea.io/gitea/modules/setting.StaticRootPath=/usr/share/forgejo\""
LDFLAGS="$LDFLAGS -X \"code.gitea.io/gitea/modules/setting.AppWorkPath=/var/lib/forgejo\""
LDFLAGS="$LDFLAGS -X \"code.gitea.io/gitea/modules/setting.CustomConf=/etc/forgejo/app.ini\""
export LDFLAGS
make build
EXIT_STATUS=$?
mv gitea ../"$3"
@ -99,26 +95,15 @@ case "$1" in
if [ ! $CI_COMMIT_TAG_RESOLVE ] ; then
echo "Failed to resolve exact tag! Getting as close as we can..."
git describe --tags HEAD
FORGEJO_CLOSEST_TAG=$(git describe --tags HEAD --abbrev=0)
echo "Looking for experimental tag..."
EXPERIMENTAL_REPO="forgejo-experimental/forgejo"
git remote add experimental $CI_VERIFY_API/$EXPERIMENTAL_REPO
git fetch experimental --tags
CI_COMMIT_TAG_RESOLVE=$(git tag --points-at HEAD)
if [ $CI_COMMIT_TAG_RESOLVE ] ; then
CI_VERIFY_REPO=$EXPERIMENTAL_REPO
FORGEJO_CLOSEST_TAG=$CI_COMMIT_TAG_RESOLVE
echo "Found it! Using experimental tag and downloading binary from $CI_VERIFY_REPO"
fi
CI_COMMIT_TAG_RESOLVE=$FORGEJO_CLOSEST_TAG
CI_COMMIT_TAG_RESOLVE=$(git describe --tags HEAD --abbrev=0)
echo "Closest existing tag: $CI_COMMIT_TAG_RESOLVE"
if [ "$CI_COMMIT_TAG_RESOLVE" != "${CI_COMMIT_TAG_RESOLVE%"-dev"}" ] || [ ! "$CI_COMMIT_TAG_RESOLVE" ] ; then
if [ "$CI_COMMIT_TAG_RESOLVE" = *"-dev" ] ; then
if [ $PR_MODE ] ; then
echo "I can't figure out which release version of Forgejo to build your PR against."
echo "Whatever you're trying to do is not yet implemented."
exit 97
fi
echo "err! unable to resolve tag or building dev version- skipping binary dl"
echo "err! building dev version- skipping binary dl"
CI_COMMIT_TAG_RESOLVE=
fi
fi
@ -149,14 +134,11 @@ case "$1" in
mkdir deb/forgejo-sqlite-bin
mv forgejo-bin deb/forgejo-bin/forgejo
mv forgejo-sqlite-bin deb/forgejo-sqlite-bin/forgejo
cp -r forgejo/public deb/public
cp -r forgejo/templates deb/templates
cp -r forgejo/options deb/options
if [ -x forgejo-bin-dl ] ; then
mkdir deb/forgejo-bin-dl
mv forgejo-bin-dl deb/forgejo-bin-dl/forgejo
mv deb/.forgejo-bin.install deb/debian/forgejo-bin.install
ln -s forgejo-common.preinst deb/debian/forgejo-bin.preinst
ln -s forgejo.preinst deb/debian/forgejo-bin.preinst
ln -s forgejo.postinst deb/debian/forgejo-bin.postinst
ln -s forgejo.prerm deb/debian/forgejo-bin.prerm
echo >> deb/debian/control
@ -199,27 +181,13 @@ case "$1" in
"install-run-test")
export DEBIAN_FRONTEND=noninteractive
apt update
if [ "$2" = "${2#"./forgejo-bin_"}" ] ; then
APT_FORGEJO_COMMON_RESOLVE="$(ls -1 ./forgejo-common_*_all.deb)"
if [ -f "$APT_FORGEJO_COMMON_RESOLVE" ] ; then
APT_FORGEJO_COMMON="./$APT_FORGEJO_COMMON_RESOLVE"
else
echo "ERR! Unable to find the necessary forgejo-common package!"
exit 96
fi
fi
apt install -y $APT_FORGEJO_COMMON ./"$2"
if [ -f "/etc/default/forgejo" ] || [ "$2" != "${2#"./forgejo-bin_"}" ] ; then
apt install -y ./"$2"
[ -f "/etc/default/forgejo" ] && . /etc/default/forgejo
[ -z "$FORGEJO_HOME" ] && FORGEJO_HOME=/var/lib/forgejo
[ -z "$FORGEJO_USER" ] && FORGEJO_USER=forgejo
sudo -u $FORGEJO_USER USER=$FORGEJO_USER \
HOME=$FORGEJO_HOME FORGEJO_WORK_DIR=$FORGEJO_HOME \
HOME=$FORGEJO_HOME GITEA_WORK_DIR=$FORGEJO_HOME \
forgejo web -q --config /etc/forgejo/app.ini &
else
echo "No env setup! Run testing defaults using hardcoded vars..."
sudo -u forgejo USER=forgejo forgejo web -q &
fi
sleep 10
curl http://localhost:3000/ | grep -A 4 "Powered by Forgejo"
exit $?
@ -234,7 +202,7 @@ case "$1" in
apt update -qq
apt install -y "$3"
sudo -u forgejo USER=forgejo \
HOME=/var/lib/forgejo FORGEJO_WORK_DIR=/var/lib/forgejo \
HOME=/var/lib/forgejo GITEA_WORK_DIR=/var/lib/forgejo \
forgejo web -q --config /etc/fogejo/app.ini &
sleep 10
curl http://localhost:3000/ | grep -A 4 "Powered by Forgejo"

View file

@ -1,14 +1,25 @@
on: [push, pull_request]
jobs:
mirror:
runs-on: bookworm
if: github.event_name == 'push'
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: "mirror repo: code.forgejo.org"
env:
FORGEJO_DEST: code.forgejo.org
FORGEJO_KEY: ${{ secrets.cfo_api_key }}
run: ./.action-forgejo-mirror.sh
build-forgejo-deb:
runs-on: bullseye
steps:
- uses: actions/checkout@v4
with:
submodules: true
fetch-depth: 0
fetch-tags: true
filter: tree:0
- uses: actions/setup-node@v3
with:
@ -16,13 +27,19 @@ jobs:
- uses: actions/setup-go@v4
with:
go-version: "1.24"
go-version: "1.22"
check-latest: true
- name: "actions prep: build-forgejo-deb"
id: ciprep
run: ./.ci-make.sh actions-prep build-forgejo-deb
- name: fetch tags
run: |
git config --add safe.directory '*'
git fetch --tags --force
git submodule foreach 'git fetch --tags --force'
- uses: crystal/install-jq-action@v2.1.0
- run: ./.ci-make.sh ci-verify forgejo
@ -45,11 +62,13 @@ jobs:
- name: Build Forgejo for amd64
run: ./.ci-make.sh submodule-build forgejo forgejo-bin
env:
TAGS: bindata
- name: Build Forgejo (with SQLite) for amd64
run: ./.ci-make.sh submodule-build forgejo forgejo-sqlite-bin
env:
TAGS: sqlite sqlite_unlock_notify
TAGS: bindata sqlite sqlite_unlock_notify
- run: ./.ci-make.sh package-prep
- run: ./.ci-make.sh package-build-deps
@ -80,8 +99,6 @@ jobs:
installtest-bookworm-sqlite:
runs-on: bookworm
needs:
- build-forgejo-deb
steps:
- uses: actions/checkout@v4
@ -97,8 +114,6 @@ jobs:
installtest-bullseye-sqlite:
runs-on: bullseye
needs:
- build-forgejo-deb
steps:
- uses: actions/checkout@v4
@ -114,8 +129,6 @@ jobs:
installtest-buster-sqlite:
runs-on: buster
needs:
- build-forgejo-deb
steps:
- uses: actions/checkout@v4
@ -131,8 +144,6 @@ jobs:
installtest-bookworm-user:
runs-on: bookworm
needs:
- build-forgejo-deb
steps:
- uses: actions/checkout@v4
@ -149,8 +160,6 @@ jobs:
testsuite-repo-upgrade-sqlite:
runs-on: bookworm
needs:
- build-forgejo-deb
steps:
- uses: actions/checkout@v4
@ -169,8 +178,6 @@ jobs:
installtest-buster-bin:
runs-on: buster
needs:
- build-forgejo-deb
steps:
- uses: actions/checkout@v4
@ -186,8 +193,7 @@ jobs:
publish-release-repo:
runs-on: bookworm
needs:
- build-forgejo-deb
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
steps:
- uses: actions/checkout@v4
@ -203,20 +209,27 @@ jobs:
- run: mkdir forgejo-release
- run: mv *.deb *.deb.sha256 forgejo-release/
# - uses: actions/forgejo-release@v1
# with:
# direction: upload
# url: https://forgejo.glicid.fr
# token: ${{ secrets.CFO_API_KEY }}
# release-dir: forgejo-release
- uses: actions/forgejo-release@v1
with:
direction: upload
url: https://codeberg.org
token: ${{ secrets.codeberg_api_key }}
release-dir: forgejo-release
- uses: actions/forgejo-release@v1
with:
direction: upload
url: https://code.forgejo.org
token: ${{ secrets.cfo_api_key }}
release-dir: forgejo-release
- name: Debian package registry publish
env:
FORGEJO_SITE: https://forgejo.glicid.fr
FORGEJO_OWNER: GLiCID
DEBIAN_DIST: bookworm
DEBIAN_COMPONENT: forgejo
FORGEJO_KEY: ${{ secrets.CFO_API_KEY }}
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 forgejo-release
../.ci-forgejo-apt.sh *.deb

View file

@ -2,7 +2,7 @@ Package: forgejo-bin
Architecture: amd64
Priority: optional
Provides: forgejo,gitea
Depends: adduser (>= 3.11), git
Conflicts: forgejo, forgejo-sqlite, forgejo-common
Depends: adduser (>= 3.11)
Conflicts: forgejo,forgejo-bin
Description: Forgejo: Beyond Coding. We Forge. (binary)
The official Forgejo release binary in a Debian package

View file

@ -1,4 +1,4 @@
forgejo (7.0.1-2) unstable; urgency=medium
forgejo (7.0.1-1) unstable; urgency=medium
WARNING: Forgejo will be upgraded to v7.0.1 LTS

View file

@ -1,112 +1,7 @@
forgejo (11.0.0-1) unstable; urgency=medium
* Forgejo version 11.0.0
* See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#11.0.0
* Split `forgejo-common` package for extra data
-- crystal <crystal@noreply.codeberg.org> Wed, 30 Apr 2025 00:55:00 +0000
forgejo (10.0.3-1) unstable; urgency=medium
* Forgejo version 10.0.3
* See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#10.0.3
* Split `forgejo-common` package for extra data
-- crystal <crystal@noreply.codeberg.org> Sat, 29 Mar 2025 00:55:00 +0000
forgejo (10.0.2-1) unstable; urgency=medium
* Forgejo version 10.0.2
* See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#10.0.2
* Split `forgejo-common` package for extra data
-- crystal <crystal@noreply.codeberg.org> Sat, 29 Mar 2025 00:55:00 +0000
forgejo (10.0.1-1) unstable; urgency=medium
* Forgejo version 10.0.1
* See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#10.0.1
* Split `forgejo-common` package for extra data
-- crystal <crystal@noreply.codeberg.org> Mon, 17 Feb 2025 00:55:00 +0000
forgejo (10.0.0-1) unstable; urgency=medium
* Forgejo version 10.0.0
* See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#10.0.0
* Split `forgejo-common` package for extra data
-- crystal <crystal@noreply.codeberg.org> Sun, 19 Dec 2025 00:55:00 +0000
forgejo (9.0.3-1) unstable; urgency=medium
* Forgejo version 9.0.3
* See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#9.0.3
* Split `forgejo-common` package for extra data
-- crystal <crystal@noreply.codeberg.org> Sat, 14 Dec 2024 00:55:00 +0000
forgejo (9.0.2-1) unstable; urgency=medium
* Forgejo version 9.0.2
* See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#9.0.2
* Split `forgejo-common` package for extra data
-- crystal <crystal@noreply.codeberg.org> Sat, 14 Dec 2024 00:55:00 +0000
forgejo (9.0.1-1) unstable; urgency=medium
* Forgejo version 9.0.1
* See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#9.0.1
* Split `forgejo-common` package for extra data
-- crystal <crystal@noreply.codeberg.org> Mon, 28 Oct 2024 00:55:00 +0000
forgejo (8.0.3-1) unstable; urgency=medium
* Forgejo version 8.0.3
* See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#8.0.3
* Split `forgejo-common` package for extra data
-- crystal <crystal@noreply.codeberg.org> Sun, 15 Sep 2024 00:55:00 +0000
forgejo (8.0.2-1) unstable; urgency=medium
* Forgejo version 8.0.2
* See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#8.0.2
* Split `forgejo-common` package for extra data
-- crystal <crystal@noreply.codeberg.org> Sun, 01 Sep 2024 00:55:00 +0000
forgejo (8.0.1-1) unstable; urgency=medium
* Forgejo version 8.0.1
* See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#8.0.1
* Split `forgejo-common` package for extra data
-- crystal <crystal@noreply.codeberg.org> Tue, 27 Aug 2024 00:55:00 +0000
forgejo (7.0.7-1) unstable; urgency=medium
* Forgejo version 7.0.7
* See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#7-0-7
* Split `forgejo-common` package for extra data
-- crystal <crystal@noreply.codeberg.org> Mon, 26 Aug 2024 00:55:00 +0000
forgejo (7.0.5-1) unstable; urgency=medium
* Forgejo version 7.0.5
* See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#7-0-5
* Split `forgejo-common` package for extra data
-- crystal <crystal@noreply.codeberg.org> Sun, 07 July 2024 17:22:00 +0000
forgejo (7.0.1-1) unstable; urgency=medium
* Forgejo version 7.0.1
* See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#7-0-1
* Forgejo Actions based build process
-- crystal <crystal@noreply.codeberg.org> Sat, 27 Apr 2024 15:35:00 +0000

View file

@ -8,7 +8,7 @@ Package: forgejo
Architecture: amd64
Priority: optional
Provides: gitea
Depends: forgejo-common (= ${source:Version}), adduser (>= 3.11), git
Depends: adduser (>= 3.11),git
Conflicts: forgejo-sqlite,forgejo-bin
Description: Forgejo: Beyond Coding. We Forge.
Forgejo with bindata ONLY - Use this package for MySQL or PostgreSQL setup
@ -17,15 +17,7 @@ Package: forgejo-sqlite
Architecture: amd64
Priority: optional
Provides: forgejo,gitea
Depends: forgejo-common (= ${source:Version}), adduser (>= 3.11), git
Depends: adduser (>= 3.11),git
Conflicts: forgejo,forgejo-bin
Description: Forgejo: Beyond Coding. We Forge. (SQLite)
Forgejo with bindata and SQLite support - Use this package to get started immediately
Package: forgejo-common
Architecture: all
Priority: optional
Depends: forgejo | forgejo-sqlite (= ${source:Version})
Conflicts: forgejo-bin
Description: Common files for Forgejo
Common data used for all Forgejo packages and architectures.

View file

@ -1,5 +0,0 @@
public/ /usr/share/forgejo
templates/ /usr/share/forgejo
options/ /usr/share/forgejo
forgejo.service /usr/lib/systemd/system
app.ini /etc/forgejo

View file

@ -1 +1,3 @@
forgejo-sqlite-bin/forgejo /usr/bin
forgejo.service /usr/lib/systemd/system
app.ini /etc/forgejo

View file

@ -0,0 +1 @@
forgejo.preinst

View file

@ -1 +1,3 @@
forgejo-bin/forgejo /usr/bin
forgejo.service /usr/lib/systemd/system
app.ini /etc/forgejo

View file

@ -61,7 +61,7 @@ WorkingDirectory=~
#RuntimeDirectory=forgejo
ExecStart=/usr/bin/forgejo web --config /etc/forgejo/app.ini
Restart=always
Environment=USER=forgejo HOME=/var/lib/forgejo FORGEJO_WORK_DIR=/var/lib/forgejo
Environment=USER=forgejo HOME=/var/lib/forgejo GITEA_WORK_DIR=/var/lib/forgejo
# If you install Git to directory prefix other than default PATH (which happens
# for example if you install other versions of Git side-to-side with
# distribution version), uncomment below line and add that prefix to PATH

View file

@ -3,4 +3,4 @@
# LimitNOFILE=524288:524288
User=git
Group=git
Environment=USER=git HOME=/var/lib/forgejo FORGEJO_WORK_DIR=/var/lib/forgejo
Environment=USER=git HOME=/var/lib/forgejo GITEA_WORK_DIR=/var/lib/forgejo

@ -1 +1 @@
Subproject commit 308810cdd17e3edf928d38c5d410acf2c7aa7618
Subproject commit 554f3697fc4519b44fb583925259db97eb3a8f5b

View file

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

View file

@ -1,26 +0,0 @@
forgejo-deb-repo (2-4) 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
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
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 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 17:48:00 +0000

View file

@ -1,15 +1,3 @@
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 17:48:00 +0000
forgejo-deb-repo (2-2) unstable; urgency=medium
* Add apt-listchanges dep for important upgrade notices
-- crystal <crystal@noreply.codeberg.org> Sun, 28 Apr 2024 13:13:00 +0000
forgejo-deb-repo (2-1) unstable; urgency=medium
* Move to https://code.forgejo.org/forgejo-contrib/-/packages

View file

@ -7,8 +7,7 @@ Build-Depends: debhelper (>= 10)
Package: forgejo-deb-repo
Architecture: all
Priority: optional
Depends: forgejo-deb-repokey, apt-transport-https, apt-listchanges
Conflicts: forgejo-deb-repo-lts
Depends: forgejo-deb-repokey, apt-transport-https
Description: APT Repository for forgejo-deb builds
Forgejo will be updated via apt along with other software on your system

View file

@ -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 18:25:00 +0000
-- crystal <crystal@noreply.codeberg.org> Tue, 25 Jul 2023 10:50:00 +0000