zontreck/wine
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine.git synced 2024-11-19 17:06:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab: Upgrade the Debian image to bookworm.

Browse source
This commit is contained in:
Alexandre Julliard 2023-07-10 17:18:49 +02:00
parent 1591e01e5d
commit 5799e89f15
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/gitlab/build.yml
View file

@ -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:

5
tools/gitlab/image.docker
View file

@ -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 \

4
tools/gitlab/image.yml
View file

@ -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

2
tools/gitlab/test.yml
View file

@ -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