From 7d8bfe2287779988bc2aa5f6bca128849b6924e9 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 11 Oct 2023 11:40:43 -0300
Subject: [PATCH] WIP: bookworm
---
.gitlab-ci.yml | 2 +-
Dockerfile | 4 ++--
install.sh | 7 ++-----
test.sh | 3 +--
4 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d909fbf..b1e0290 100644
--- a/.gitlab-ci.yml
+++ b/.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:
diff --git a/Dockerfile b/Dockerfile
index fa5c823..5f0ccce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
-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
diff --git a/install.sh b/install.sh
index f68eb73..aad982e 100755
--- a/install.sh
+++ b/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"
diff --git a/test.sh b/test.sh
index fe031fc..e382d2d 100755
--- a/test.sh
+++ b/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"
--
GitLab