From b25e8c14f8999f47790b2915738fe4e93d9608e7 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Sat, 25 Mar 2023 19:36:58 +0100
Subject: [PATCH] .gitlab-ci.yml: revise combinations of JDK and OS

There are now 4 jobs:

* using OpenJDK 11 on Debian Bullseye (our current reference),
* using OpenJDK 17 on Debian Bookworm (our future reference),
* using OpenJDK 11 on Ubuntu Jammy, and
* using OpenJDK 17 on Ubuntu Lunar
---
 .gitlab-ci.yml | 47 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7cbfaed..26bc698 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,20 +1,41 @@
-image: ${DOCKER_IMAGE}
-
 variables:
-  GIT_SUBMODULE_STRATEGY:         recursive
-  ANDROID_HOME:                   $PWD/android-sdk
+  GIT_SUBMODULE_STRATEGY: recursive
+  ANDROID_HOME:           $PWD/android-sdk
 
 before_script:
   - apt-get update
-  - apt-get -y upgrade
-  - apt-get -y install ${JDK_PACKAGE}
-  - apt-get -y install sdkmanager gradle
-  - yes | sdkmanager --licenses >/dev/null || true
 
-build:
-  parallel:
-    matrix:
-      - DOCKER_IMAGE: [ ubuntu:jammy, debian:bullseye-backports ]
-        JDK_PACKAGE: [ openjdk-11-jdk-headless ]
+after_script:
+  - gradle --version
+
+bullseye-jdk11:
+  image: debian:bullseye-backports
   script:
+    - apt-get -y install openjdk-11-jdk-headless
+    - apt-get -y install sdkmanager gradle
+    - yes | sdkmanager --licenses >/dev/null || true
+    - gradle build --stacktrace
+
+bookworm-jdk17:
+  image: debian:bookworm-slim
+  script:
+    - apt-get -y install openjdk-17-jdk-headless
+    - apt-get -y install sdkmanager gradle
+    - yes | sdkmanager --licenses >/dev/null || true
+    - gradle build --stacktrace
+
+jammy-jdk11:
+  image: ubuntu:jammy
+  script:
+    - apt-get -y install openjdk-11-jdk-headless
+    - apt-get -y install sdkmanager gradle
+    - yes | sdkmanager --licenses >/dev/null || true
+    - gradle build --stacktrace
+
+lunar-jdk17:
+  image: ubuntu:lunar
+  script:
+    - apt-get -y install openjdk-17-jdk-headless
+    - apt-get -y install sdkmanager gradle
+    - yes | sdkmanager --licenses >/dev/null || true
     - gradle build --stacktrace