diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e029c7ae5..347564587 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -130,36 +130,36 @@ win:container_prep: .monado.variables.debian:bullseye: variables: 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 .monado.variables.debian:bookworm-ndk: variables: FDO_DISTRIBUTION_VERSION: "bookworm" - FDO_DISTRIBUTION_TAG: "2023-11-15.1" + FDO_DISTRIBUTION_TAG: "2024-01-16" FDO_REPO_SUFFIX: ndk # Variables for build and usage of Ubuntu focal image .monado.variables.ubuntu:focal: variables: 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 .monado.variables.ubuntu:jammy: variables: 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 .monado.variables.arch: variables: - FDO_DISTRIBUTION_TAG: "2023-11-14.0" + FDO_DISTRIBUTION_TAG: "2024-01-16" # Variables for build and usage of Alpine image .monado.variables.alpine: variables: - FDO_DISTRIBUTION_TAG: "2023-11-14.3" + FDO_DISTRIBUTION_TAG: "2024-01-16" ### diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index 08c840814..2d7d4fd27 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -71,7 +71,7 @@ distributions: # This image does some extra work. - codename: bullseye script: i386_and_proclamation_container_prep.sh - tag: "2023-04-07" + tag: "2024-01-16" deb_version_suffix: bpo11 packages: <<: *default_debian_packages @@ -117,7 +117,7 @@ distributions: distro_version: bookworm repo_suffix: ndk script: android_container_prep.sh - tag: "2023-11-15.1" + tag: "2024-01-16" # This must match ext.sharedCompileSdk in build.gradle android_compile_sdk: 32 # This must match buildscript.ext.buildToolsVersion in build.gradle @@ -173,7 +173,7 @@ distributions: # LTS - codename: focal distro_version: "20.04" - tag: "2022-09-20.0" + tag: "2024-01-16" deb_version_suffix: ubuntu2004 packages: <<: *default_debian_packages @@ -183,7 +183,7 @@ distributions: - codename: jammy distro_version: "22.04" - tag: "2022-09-20.0" + tag: "2024-01-16" deb_version_suffix: ubuntu2204 packages: <<: *default_debian_packages @@ -194,7 +194,7 @@ distributions: - name: arch images: - - tag: "2023-11-14.0" + - tag: "2024-01-16" script: install-arch-additional-deps.sh # pipewire-jack wireplumber: Explicitly choose dependencies to avoid pacman asking interactively # python-setuptools glu: librealsense @@ -252,7 +252,7 @@ distributions: - name: alpine images: - - tag: "2023-11-14.3" + - tag: "2024-01-16" packages: - "cmake" - "cmd:glslangValidator"