Compare commits

..

17 commits

Author SHA1 Message Date
Alex Janka cd0d39541b lol
All checks were successful
/ publish-release-repo (push) Successful in 20s
/ build-forgejo-deb (push) Successful in 4m57s
/ installtest-bookworm-user (push) Successful in 30s
2024-07-14 14:22:09 +10:00
Alex Janka 49e0aa7021 update changelog 2024-07-14 14:22:09 +10:00
Alex Janka f24cdd64f8 get matching tagged release 2024-07-14 14:22:09 +10:00
Alex Janka 13de944abf add changelog for 7.0.2/7.0.3/7.0.4 2024-07-14 14:22:08 +10:00
Alex Janka 75b06cbc2f use forgejo-release@main 2024-07-14 14:21:52 +10:00
Alex Janka 81ad95dbb7 actually don't setup node first 2024-07-14 14:21:52 +10:00
Alex Janka 8da16fd2cb setup node first 2024-07-14 14:21:52 +10:00
Alex Janka 3a3a480540 remove forgejo-sqlite from debian control 2024-07-14 14:21:51 +10:00
Alex Janka 252eb37f7d run on tag + remove unused sqlite 2024-07-14 14:20:54 +10:00
Alex Janka ea1fde19e7 disable vuln checks 2024-07-14 14:20:23 +10:00
Alex Janka 7a740cf5d6 dont build repo deb packages 2024-07-14 14:20:23 +10:00
Alex Janka 1a80cada89 no docker specification + no buster 2024-07-14 14:20:23 +10:00
Alex Janka 2c58436bbf fix workflow for me 2024-07-14 14:20:23 +10:00
Alex Janka 7bb821c4f6 remove mirroring 2024-07-14 14:20:23 +10:00
Alex Janka c625377da9 arm64 2024-07-14 14:20:23 +10:00
crystal b5914277d3
[squash] split common data
instead of building the packaged binaries with the `bindata` tag, this
introduces a new forgejo-common package which contains common assets and
architecture independent files.

This is the first of a handful of PRs that will ultimately enable
building packages for multiple architectures.
2024-07-07 11:23:16 -06:00
Moritz Kobel 7fcc7721f8
Forgejo v7.0.5 2024-07-05 22:04:46 +02:00
12 changed files with 57 additions and 21 deletions

View file

@ -8,6 +8,10 @@ CI_VERIFY_RETRY_COUNT=30 # How many times to retry before giving up if the pipel
case "$1" in case "$1" in
"submodule-build") "submodule-build")
cd "$2" 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 make build
EXIT_STATUS=$? EXIT_STATUS=$?
mv gitea ../"$3" mv gitea ../"$3"
@ -145,11 +149,14 @@ case "$1" in
mkdir deb/forgejo-sqlite-bin mkdir deb/forgejo-sqlite-bin
mv forgejo-bin deb/forgejo-bin/forgejo mv forgejo-bin deb/forgejo-bin/forgejo
mv forgejo-sqlite-bin deb/forgejo-sqlite-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 if [ -x forgejo-bin-dl ] ; then
mkdir deb/forgejo-bin-dl mkdir deb/forgejo-bin-dl
mv forgejo-bin-dl deb/forgejo-bin-dl/forgejo mv forgejo-bin-dl deb/forgejo-bin-dl/forgejo
mv deb/.forgejo-bin.install deb/debian/forgejo-bin.install mv deb/.forgejo-bin.install deb/debian/forgejo-bin.install
ln -s forgejo.preinst deb/debian/forgejo-bin.preinst ln -s forgejo-common.preinst deb/debian/forgejo-bin.preinst
ln -s forgejo.postinst deb/debian/forgejo-bin.postinst ln -s forgejo.postinst deb/debian/forgejo-bin.postinst
ln -s forgejo.prerm deb/debian/forgejo-bin.prerm ln -s forgejo.prerm deb/debian/forgejo-bin.prerm
echo >> deb/debian/control echo >> deb/debian/control
@ -192,13 +199,27 @@ case "$1" in
"install-run-test") "install-run-test")
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
apt update apt update
apt install -y ./"$2" if [ "$2" = "${2#"./forgejo-bin_"}" ] ; then
[ -f "/etc/default/forgejo" ] && . /etc/default/forgejo APT_FORGEJO_COMMON_RESOLVE="$(ls -1 ./forgejo-common_*_all.deb)"
[ -z "$FORGEJO_HOME" ] && FORGEJO_HOME=/var/lib/forgejo if [ -f "$APT_FORGEJO_COMMON_RESOLVE" ] ; then
[ -z "$FORGEJO_USER" ] && FORGEJO_USER=forgejo APT_FORGEJO_COMMON="./$APT_FORGEJO_COMMON_RESOLVE"
sudo -u $FORGEJO_USER USER=$FORGEJO_USER \ else
HOME=$FORGEJO_HOME FORGEJO_WORK_DIR=$FORGEJO_HOME \ echo "ERR! Unable to find the necessary forgejo-common package!"
forgejo web -q --config /etc/forgejo/app.ini & exit 96
fi
fi
apt install -y $APT_FORGEJO_COMMON ./"$2"
if [ -f "/etc/default/forgejo" ] || [ "$2" != "${2#"./forgejo-bin_"}" ] ; then
[ -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 \
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 sleep 10
curl http://localhost:3000/ | grep -A 4 "Powered by Forgejo" curl http://localhost:3000/ | grep -A 4 "Powered by Forgejo"
exit $? exit $?

View file

@ -49,8 +49,6 @@ jobs:
- name: Build Forgejo for arm64 - name: Build Forgejo for arm64
run: ./.ci-make.sh submodule-build forgejo forgejo-bin run: ./.ci-make.sh submodule-build forgejo forgejo-bin
env:
TAGS: bindata
- run: ./.ci-make.sh package-prep - run: ./.ci-make.sh package-prep
- run: ./.ci-make.sh package-build-deps - run: ./.ci-make.sh package-build-deps

View file

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

View file

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

View file

@ -1,3 +1,11 @@
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.4-1) unstable; urgency=medium forgejo (7.0.4-1) unstable; urgency=medium
* Forgejo version 7.0.4 * Forgejo version 7.0.4
@ -23,6 +31,7 @@ forgejo (7.0.1-1) unstable; urgency=medium
* Forgejo version 7.0.1 * Forgejo version 7.0.1
* See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#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 -- crystal <crystal@noreply.codeberg.org> Sat, 27 Apr 2024 15:35:00 +0000

View file

@ -8,7 +8,15 @@ Package: forgejo
Architecture: arm64 Architecture: arm64
Priority: optional Priority: optional
Provides: gitea Provides: gitea
Depends: adduser (>= 3.11),git Depends: forgejo-common (= ${source:Version}), adduser (>= 3.11), git
Conflicts: forgejo-sqlite,forgejo-bin Conflicts: forgejo-sqlite, forgejo-bin
Description: Forgejo: Beyond Coding. We Forge. Description: Forgejo: Beyond Coding. We Forge.
Forgejo with bindata ONLY - Use this package for MySQL or PostgreSQL setup Forgejo with bindata ONLY - Use this package for MySQL or PostgreSQL setup
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

@ -0,0 +1,5 @@
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,3 +1 @@
forgejo-sqlite-bin/forgejo /usr/bin forgejo-sqlite-bin/forgejo /usr/bin
forgejo.service /usr/lib/systemd/system
app.ini /etc/forgejo

View file

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

View file

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

@ -1 +1 @@
Subproject commit 5c59a1347a5fbf183eef22fe46805b4d1a8606f3 Subproject commit 65a89ce6be62018ea50cb01c080072973ce87efb