ci: refresh images

This commit is contained in:
Simon Zeni 2024-01-16 21:09:24 -05:00
parent 20cb556f6d
commit 76fe524a4e
2 changed files with 12 additions and 12 deletions

View file

@ -130,36 +130,36 @@ win:container_prep:
.monado.variables.debian:bullseye: .monado.variables.debian:bullseye:
variables: variables:
FDO_DISTRIBUTION_VERSION: "bullseye" FDO_DISTRIBUTION_VERSION: "bullseye"
FDO_DISTRIBUTION_TAG: "2023-04-07" FDO_DISTRIBUTION_TAG: "2024-01-16"
# Variables for build and usage of Debian bookworm-ndk image # Variables for build and usage of Debian bookworm-ndk image
.monado.variables.debian:bookworm-ndk: .monado.variables.debian:bookworm-ndk:
variables: variables:
FDO_DISTRIBUTION_VERSION: "bookworm" FDO_DISTRIBUTION_VERSION: "bookworm"
FDO_DISTRIBUTION_TAG: "2023-11-15.1" FDO_DISTRIBUTION_TAG: "2024-01-16"
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
.monado.variables.ubuntu:focal: .monado.variables.ubuntu:focal:
variables: variables:
FDO_DISTRIBUTION_VERSION: "20.04" FDO_DISTRIBUTION_VERSION: "20.04"
FDO_DISTRIBUTION_TAG: "2022-09-20.0" FDO_DISTRIBUTION_TAG: "2024-01-16"
# Variables for build and usage of Ubuntu jammy image # Variables for build and usage of Ubuntu jammy image
.monado.variables.ubuntu:jammy: .monado.variables.ubuntu:jammy:
variables: variables:
FDO_DISTRIBUTION_VERSION: "22.04" FDO_DISTRIBUTION_VERSION: "22.04"
FDO_DISTRIBUTION_TAG: "2022-09-20.0" FDO_DISTRIBUTION_TAG: "2024-01-16"
# Variables for build and usage of Arch image # Variables for build and usage of Arch image
.monado.variables.arch: .monado.variables.arch:
variables: variables:
FDO_DISTRIBUTION_TAG: "2023-11-14.0" FDO_DISTRIBUTION_TAG: "2024-01-16"
# Variables for build and usage of Alpine image # Variables for build and usage of Alpine image
.monado.variables.alpine: .monado.variables.alpine:
variables: variables:
FDO_DISTRIBUTION_TAG: "2023-11-14.3" FDO_DISTRIBUTION_TAG: "2024-01-16"
### ###

View file

@ -71,7 +71,7 @@ distributions:
# This image does some extra work. # This image does some extra work.
- codename: bullseye - codename: bullseye
script: i386_and_proclamation_container_prep.sh script: i386_and_proclamation_container_prep.sh
tag: "2023-04-07" tag: "2024-01-16"
deb_version_suffix: bpo11 deb_version_suffix: bpo11
packages: packages:
<<: *default_debian_packages <<: *default_debian_packages
@ -117,7 +117,7 @@ distributions:
distro_version: bookworm distro_version: bookworm
repo_suffix: ndk repo_suffix: ndk
script: android_container_prep.sh script: android_container_prep.sh
tag: "2023-11-15.1" tag: "2024-01-16"
# This must match ext.sharedCompileSdk in build.gradle # This must match ext.sharedCompileSdk in build.gradle
android_compile_sdk: 32 android_compile_sdk: 32
# This must match buildscript.ext.buildToolsVersion in build.gradle # This must match buildscript.ext.buildToolsVersion in build.gradle
@ -173,7 +173,7 @@ distributions:
# LTS # LTS
- codename: focal - codename: focal
distro_version: "20.04" distro_version: "20.04"
tag: "2022-09-20.0" tag: "2024-01-16"
deb_version_suffix: ubuntu2004 deb_version_suffix: ubuntu2004
packages: packages:
<<: *default_debian_packages <<: *default_debian_packages
@ -183,7 +183,7 @@ distributions:
- codename: jammy - codename: jammy
distro_version: "22.04" distro_version: "22.04"
tag: "2022-09-20.0" tag: "2024-01-16"
deb_version_suffix: ubuntu2204 deb_version_suffix: ubuntu2204
packages: packages:
<<: *default_debian_packages <<: *default_debian_packages
@ -194,7 +194,7 @@ distributions:
- name: arch - name: arch
images: images:
- tag: "2023-11-14.0" - tag: "2024-01-16"
script: install-arch-additional-deps.sh script: install-arch-additional-deps.sh
# pipewire-jack wireplumber: Explicitly choose dependencies to avoid pacman asking interactively # pipewire-jack wireplumber: Explicitly choose dependencies to avoid pacman asking interactively
# python-setuptools glu: librealsense # python-setuptools glu: librealsense
@ -252,7 +252,7 @@ distributions:
- name: alpine - name: alpine
images: images:
- tag: "2023-11-14.3" - tag: "2024-01-16"
packages: packages:
- "cmake" - "cmake"
- "cmd:glslangValidator" - "cmd:glslangValidator"