The open source OpenXR runtime
ci: Switch to use bookworm for JDK17
Signed-off-by: utzcoz <utzcoz@outlook.com>
authored by
utzcoz
and committed by
Rylie Pavlik
59995ebc
4c1fd416
+22
-22
+18
-18
.gitlab-ci.yml
+18
-18
.gitlab-ci.yml
···
131
131
FDO_DISTRIBUTION_VERSION: "bullseye"
132
132
FDO_DISTRIBUTION_TAG: "2023-04-07"
133
133
134
-
# Variables for build and usage of Debian bullseye-ndk image
135
-
.monado.variables.debian:bullseye-ndk:
134
+
# Variables for build and usage of Debian bookworm-ndk image
135
+
.monado.variables.debian:bookworm-ndk:
136
136
variables:
137
-
FDO_DISTRIBUTION_VERSION: "bullseye"
138
-
FDO_DISTRIBUTION_TAG: "2023-10-28.0"
137
+
FDO_DISTRIBUTION_VERSION: "bookworm"
138
+
FDO_DISTRIBUTION_TAG: "2023-11-15.1"
139
139
FDO_REPO_SUFFIX: ndk
140
140
141
141
# Variables for build and usage of Ubuntu focal image
···
170
170
FDO_DISTRIBUTION_PACKAGES: 'build-essential ca-certificates clang-format cmake codespell curl debhelper devscripts doxygen dput-ng gettext-base git glslang-tools graphviz libavcodec-dev libbluetooth-dev libbsd-dev libcjson-dev libdbus-1-dev libegl1-mesa-dev libeigen3-dev libgl1-mesa-dev libglvnd-dev libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libhidapi-dev libopencv-dev libsdl2-dev libsystemd-dev libudev-dev libusb-1.0-0-dev libuvc-dev libv4l-dev libvulkan-dev libwayland-dev libx11-dev libx11-xcb-dev libxcb-randr0-dev libxrandr-dev libxxf86vm-dev ninja-build pandoc patch pkg-config python3 python3-click python3-pip unzip wget'
171
171
FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/i386_and_proclamation_container_prep.sh'
172
172
173
-
# Make Debian bullseye-ndk image
174
-
debian:bullseye-ndk:container_prep:
173
+
# Make Debian bookworm-ndk image
174
+
debian:bookworm-ndk:container_prep:
175
175
stage: container_prep
176
176
extends:
177
177
- .container-rules
178
-
- .monado.variables.debian:bullseye-ndk
178
+
- .monado.variables.debian:bookworm-ndk
179
179
- .fdo.container-build@debian # from ci-templates
180
180
181
181
variables:
182
-
FDO_DISTRIBUTION_PACKAGES: 'ca-certificates cmake git glslang-tools libeigen3-dev meson ninja-build openjdk-17-jdk-headless pkg-config python3 unzip wget'
182
+
FDO_DISTRIBUTION_PACKAGES: 'ca-certificates cmake default-jdk-headless git glslang-tools libeigen3-dev meson ninja-build pkg-config python3 unzip wget'
183
183
FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/android_container_prep.sh'
184
184
185
185
# Make Ubuntu focal image
···
228
228
- .build-rules
229
229
230
230
231
-
# Base for using Debian bullseye-ndk image
232
-
.monado.image.debian:bullseye-ndk:
231
+
# Base for using Debian bookworm-ndk image
232
+
.monado.image.debian:bookworm-ndk:
233
233
extends:
234
-
- .monado.variables.debian:bullseye-ndk
234
+
- .monado.variables.debian:bookworm-ndk
235
235
- .fdo.suffixed-image@debian # from ci-templates
236
236
- .build-rules
237
237
···
349
349
ndk:armeabi-v7a:
350
350
stage: build
351
351
extends:
352
-
- .monado.image.debian:bullseye-ndk
352
+
- .monado.image.debian:bookworm-ndk
353
353
script:
354
354
355
355
- .gitlab-ci/prebuild.sh
···
358
358
ndk:arm64-v8a:
359
359
stage: build
360
360
extends:
361
-
- .monado.image.debian:bullseye-ndk
361
+
- .monado.image.debian:bookworm-ndk
362
362
script:
363
363
364
364
- .gitlab-ci/prebuild.sh
···
367
367
android:spotlessCheck:
368
368
stage: build
369
369
extends:
370
-
- .monado.image.debian:bullseye-ndk
370
+
- .monado.image.debian:bookworm-ndk
371
371
before_script:
372
372
# For caching gradle stuff
373
373
- export GRADLE_USER_HOME=`pwd`/.gradlehome
···
387
387
android:outOfProcessDebug:
388
388
stage: build
389
389
extends:
390
-
- .monado.image.debian:bullseye-ndk
390
+
- .monado.image.debian:bookworm-ndk
391
391
before_script:
392
392
# For caching gradle stuff
393
393
- export GRADLE_USER_HOME=`pwd`/.gradlehome
···
410
410
android:inProcessDebug:
411
411
stage: build
412
412
extends:
413
-
- .monado.image.debian:bullseye-ndk
413
+
- .monado.image.debian:bookworm-ndk
414
414
before_script:
415
415
# For caching gradle stuff
416
416
- export GRADLE_USER_HOME=`pwd`/.gradlehome
···
433
433
android:outOfProcessRelease:
434
434
stage: build
435
435
extends:
436
-
- .monado.image.debian:bullseye-ndk
436
+
- .monado.image.debian:bookworm-ndk
437
437
before_script:
438
438
# For caching gradle stuff
439
439
- export GRADLE_USER_HOME=`pwd`/.gradlehome
···
456
456
android:inProcessRelease:
457
457
stage: build
458
458
extends:
459
-
- .monado.image.debian:bullseye-ndk
459
+
- .monado.image.debian:bookworm-ndk
460
460
before_script:
461
461
# For caching gradle stuff
462
462
- export GRADLE_USER_HOME=`pwd`/.gradlehome
+4
-4
.gitlab-ci/config.yml
+4
-4
.gitlab-ci/config.yml
···
114
114
115
115
# This one is pretty minimal, compared to the others.
116
116
# Though, we now install the android SDK in it...
117
-
- codename: bullseye-ndk
118
-
distro_version: bullseye
117
+
- codename: bookworm-ndk
118
+
distro_version: bookworm
119
119
repo_suffix: ndk
120
120
script: android_container_prep.sh
121
-
tag: "2023-04-10.1"
121
+
tag: "2023-11-15.1"
122
122
# This must match ext.sharedCompileSdk in build.gradle
123
123
android_compile_sdk: 32
124
124
# This must match buildscript.ext.buildToolsVersion in build.gradle
···
138
138
pkg-config:
139
139
ca-certificates:
140
140
glslang-tools:
141
-
openjdk-17-jdk-headless:
141
+
default-jdk-headless:
142
142
build_jobs:
143
143
- name: "ndk:armeabi-v7a"
144
144
cmake_defines: