Module: wine Branch: master Commit: 5799e89f15b5584f186dcc2fd24b98e0a7bd6c10 URL: https://gitlab.winehq.org/wine/wine/-/commit/5799e89f15b5584f186dcc2fd24b98e...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Jul 10 17:18:49 2023 +0200
gitlab: Upgrade the Debian image to bookworm.
---
tools/gitlab/build.yml | 4 ++-- tools/gitlab/image.docker | 5 ++--- tools/gitlab/image.yml | 4 ++-- tools/gitlab/test.yml | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index b474f271c8b..441582a99f3 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -2,7 +2,7 @@
.wine-build: stage: build - image: $CI_REGISTRY/wine/wine:debian-bullseye + image: $CI_REGISTRY/wine/wine:debian-bookworm interruptible: true variables: GIT_DEPTH: 0 @@ -64,7 +64,7 @@ build-daily-linux:
build-winetest: stage: build - image: $CI_REGISTRY/wine/wine:debian-bullseye + image: $CI_REGISTRY/wine/wine:debian-bookworm rules: - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH needs: diff --git a/tools/gitlab/image.docker b/tools/gitlab/image.docker index cf16ed49c95..c7f9bcd1c08 100644 --- a/tools/gitlab/image.docker +++ b/tools/gitlab/image.docker @@ -23,13 +23,12 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ libgl1-mesa-dev:amd64 libgl1-mesa-dev:i386 \ libgnutls28-dev:amd64 libgnutls28-dev:i386 \ libgphoto2-dev:amd64 libgphoto2-dev:i386 \ - libgstreamer-plugins-base1.0-dev:amd64 libgstreamer-plugins-base1.0-dev:i386 \ + libgstreamer-plugins-base1.0-dev:i386 \ libice-dev:amd64 libice-dev:i386 \ libkrb5-dev:amd64 libkrb5-dev:i386 \ - libldap-dev:amd64 libldap-dev:i386 \ - libopenal-dev:amd64 libopenal-dev:i386 \ libosmesa6-dev:amd64 libosmesa6-dev:i386 \ libpcap-dev:amd64 libpcap-dev:i386 \ + libpcsclite-dev:amd64 \ libpulse-dev:amd64 libpulse-dev:i386 \ libsane-dev:amd64 libsane-dev:i386 \ libsdl2-dev:amd64 libsdl2-dev:i386 \ diff --git a/tools/gitlab/image.yml b/tools/gitlab/image.yml index 7a866553dc2..1e9b3207572 100644 --- a/tools/gitlab/image.yml +++ b/tools/gitlab/image.yml @@ -11,8 +11,8 @@ build-image: name: gcr.io/kaniko-project/executor:debug entrypoint: [""] variables: - IMAGE_SOURCE: "$CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX/debian:bullseye" - IMAGE_LOCAL: "$CI_REGISTRY_IMAGE:debian-bullseye" + IMAGE_SOURCE: "$CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX/debian:bookworm" + IMAGE_LOCAL: "$CI_REGISTRY_IMAGE:debian-bookworm" DOCKER_FILE: "$CI_PROJECT_DIR/tools/gitlab/image.docker" script: - mkdir -p /kaniko/.docker diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index 568addecb5c..1fa0ce402af 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -2,7 +2,7 @@
.wine-test: stage: test - image: $CI_REGISTRY/wine/wine:debian-bullseye + image: $CI_REGISTRY/wine/wine:debian-bookworm interruptible: true variables: GIT_STRATEGY: none