mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-28 18:46:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ci: Use JDK17 to build Android targets

Browse source 
The latest AGP 8.x needs JDK17.

Signed-off-by: utzcoz <utzcoz@outlook.com>
This commit is contained in:
utzcoz 2023-10-28 18:51:19 +08:00 committed by Rylie Pavlik
parent 671639fd2a
commit 024d952de8
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -135,7 +135,7 @@ win:container_prep:
.monado.variables.debian:bullseye-ndk: .monado.variables.debian:bullseye-ndk:
variables: variables:
FDO_DISTRIBUTION_VERSION: "bullseye" FDO_DISTRIBUTION_VERSION: "bullseye"
FDO_DISTRIBUTION_TAG: "2023-04-10.1" FDO_DISTRIBUTION_TAG: "2023-10-28.0"
FDO_REPO_SUFFIX: ndk FDO_REPO_SUFFIX: ndk
# Variables for build and usage of Ubuntu focal image # Variables for build and usage of Ubuntu focal image
@ -179,7 +179,7 @@ debian:bullseye-ndk:container_prep:
- .fdo.container-build@debian # from ci-templates - .fdo.container-build@debian # from ci-templates
variables: variables:
FDO_DISTRIBUTION_PACKAGES: 'ca-certificates cmake default-jdk-headless git glslang-tools libeigen3-dev meson ninja-build pkg-config python3 unzip wget' FDO_DISTRIBUTION_PACKAGES: 'ca-certificates cmake git glslang-tools libeigen3-dev meson ninja-build openjdk-17-jdk-headless pkg-config python3 unzip wget'
FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/android_container_prep.sh' FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/android_container_prep.sh'
# Make Ubuntu focal image # Make Ubuntu focal image

2
.gitlab-ci/config.yml
View file

@ -138,7 +138,7 @@ distributions:
pkg-config: pkg-config:
ca-certificates: ca-certificates:
glslang-tools: glslang-tools:
default-jdk-headless: openjdk-17-jdk-headless:
build_jobs: build_jobs:
- name: "ndk:armeabi-v7a" - name: "ndk:armeabi-v7a"
cmake_defines: cmake_defines: