WIP: bookworm

.gitlab-ci.yml

@@ -9,7 +9,7 @@ stages:
   - release
 
 variables:
-  TEST_IMAGE: briar/ci-image-android:${CI_BUILD_REF_NAME}
+  TEST_IMAGE: briar/ci-image-android:${CI_COMMIT_REF_NAME}
   RELEASE_IMAGE: briar/ci-image-android:latest
 
 before_script:

Dockerfile

-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 ENV LANG=C.UTF-8
 ENV DEBIAN_FRONTEND=noninteractive
 ENV ANDROID_HOME=/opt/android-sdk
-ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
 
 WORKDIR /opt/briar-ci
 

install.sh

@@ -56,9 +56,6 @@ printf "\n79120722343a6f314e0719f863036c702b0e6b2a\n84831b9409646a918e30573bab4c
 mkdir /root/.android
 touch /root/.android/repositories.cfg
 echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "platform-tools"
-echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "build-tools;30.0.3"
-echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "build-tools;31.0.0"
-echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "build-tools;32.0.0"
-echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "platforms;android-30"
-echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "platforms;android-31"
 echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "platforms;android-32"
+echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "platforms;android-33"
+echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "platforms;android-34"

test.sh

@@ -5,8 +5,7 @@ set -x
 echo "Testing Briar Desktop"
 git clone --recurse-submodules https://code.briarproject.org/briar/briar-desktop.git briar-desktop
 cd briar-desktop
-./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-11-openjdk-amd64 --no-daemon kaptKotlin
-./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64 --no-daemon -x kaptKotlin packageDeb
+./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64 --no-daemon pinpitPackageDefaultDebDebianBullseyeX64
 cd ..
 echo "Building Briar Desktop was successful"