Update to use the bookworm build image

This commit is contained in:
proletarius101 2024-03-14 12:51:08 +00:00 committed by Licaon_Kter
parent 84c90a582c
commit f60b5e5049

View file

@ -364,7 +364,7 @@ fdroid build:
needs: []
# Some env vars are setup in https://gitlab.com/fdroid/fdroidserver/-/blob/master/buildserver/setup-env-vars
# home_vagrant=/home/vagrant
image: registry.gitlab.com/fdroid/fdroidserver:buildserver-bullseye
image: registry.gitlab.com/fdroid/fdroidserver:buildserver-bookworm
tags:
- saas-linux-medium-amd64
artifacts:
@ -452,8 +452,8 @@ fdroid build:
popd;
rm -rf $home_vagrant/build || true;
rm -rf $ANDROID_HOME/ndk || true;
apt-get install -y openjdk-11-jdk-headless;
update-alternatives --set java /usr/lib/jvm/java-11-openjdk-amd64/bin/java;
apt-get install -y openjdk-17-jdk-headless;
update-alternatives --set java /usr/lib/jvm/java-17-openjdk-amd64/bin/java;
./tools/build-contains-signatures.py $build || continue;
apt-get install sudo;
$fdroid publish --verbose $build;
@ -474,7 +474,7 @@ fdroid build:
# to GitLab Pages.
pages:
stage: deploy
image: registry.gitlab.com/fdroid/fdroidserver:buildserver-bullseye
image: registry.gitlab.com/fdroid/fdroidserver:buildserver-bookworm
only:
refs:
- branches