[PATCH v2 0/1] MR8832: gitlab: Update CI image to debian trixie.
-- v2: gitlab: Update test image to debian trixie. https://gitlab.winehq.org/wine/wine/-/merge_requests/8832
From: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 1 + dlls/bcrypt/tests/bcrypt.c | 21 +++++++++------------ dlls/ddraw/tests/ddraw7.c | 1 + tools/gitlab/build.yml | 6 +++--- tools/gitlab/image-amd64.docker | 14 +++----------- tools/gitlab/image-arm64.docker | 8 ++------ tools/gitlab/image.yml | 9 +++++---- tools/gitlab/test.yml | 2 +- 8 files changed, 25 insertions(+), 37 deletions(-) diff --git a/configure.ac b/configure.ac index 2cc5398d178..3a2d8080bdc 100644 --- a/configure.ac +++ b/configure.ac @@ -3768,6 +3768,7 @@ AS_ECHO(" $as_me: Finished. Do '${MAKE-make}' to compile Wine. ") >&AS_MESSAGE_FD + dnl Local Variables: dnl comment-start: "dnl " dnl comment-end: "" diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 9a0fdf1f6b9..36f86851b3e 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2740,20 +2740,19 @@ static void test_rsa_encrypt(void) ok(encrypted_size == 80, "got size of %ld\n", encrypted_size); ret = BCryptEncrypt(key, input, sizeof(input), &oaep_pad, NULL, 0, encrypted_a, encrypted_size, &encrypted_size, BCRYPT_PAD_OAEP); - todo_wine ok(ret == STATUS_SUCCESS, "got %lx\n", ret); + ok(ret == STATUS_SUCCESS, "got %lx\n", ret); ok(encrypted_size == 80, "got size of %ld\n", encrypted_size); ret = BCryptEncrypt(key, input, sizeof(input), &oaep_pad, NULL, 0, encrypted_b, encrypted_size, &encrypted_size, BCRYPT_PAD_OAEP); - todo_wine ok(ret == STATUS_SUCCESS, "got %lx\n", ret); + ok(ret == STATUS_SUCCESS, "got %lx\n", ret); ok(encrypted_size == 80, "got size of %ld\n", encrypted_size); - todo_wine ok(memcmp(encrypted_a, encrypted_b, encrypted_size), "Both outputs are the same\n"); + ok(memcmp(encrypted_a, encrypted_b, encrypted_size), "Both outputs are the same\n"); decrypted_size = 0; memset(decrypted, 0, sizeof(decrypted)); ret = BCryptDecrypt(key, encrypted_a, encrypted_size, NULL, NULL, 0, NULL, 0, &decrypted_size, BCRYPT_PAD_OAEP); ok(ret == STATUS_INVALID_PARAMETER, "got %lx\n", ret); - todo_wine { decrypted_size = 0; memset(decrypted, 0, sizeof(decrypted)); ret = BCryptDecrypt(key, encrypted_a, encrypted_size, &oaep_pad, NULL, 0, NULL, 0, &decrypted_size, BCRYPT_PAD_OAEP); @@ -2764,7 +2763,6 @@ static void test_rsa_encrypt(void) ok(ret == STATUS_SUCCESS, "got %lx\n", ret); ok(decrypted_size == sizeof(input), "got %lu\n", decrypted_size); ok(!memcmp(decrypted, input, sizeof(input)), "unexpected output\n"); - } free(encrypted_a); free(encrypted_b); @@ -3248,7 +3246,7 @@ static void test_ECDH_alg(const struct ecdh_test *t) win_skip("BCRYPT_KDF_RAW_SECRET not supported\n"); goto raw_secret_end; } - todo_wine ok(status == STATUS_SUCCESS, "got %#lx\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); if (status != STATUS_SUCCESS) goto raw_secret_end; ok(size == (t->bitlen + 7) / 8, "size of secret key incorrect, got %lu, expected 32\n", size); @@ -3260,7 +3258,7 @@ static void test_ECDH_alg(const struct ecdh_test *t) raw_secret_end: status = BCryptDeriveKey(secret, BCRYPT_KDF_HASH, &hash_params, NULL, 0, &size, 0); - todo_wine ok (status == STATUS_SUCCESS, "got %#lx\n", status); + ok (status == STATUS_SUCCESS, "got %#lx\n", status); if (status != STATUS_SUCCESS) goto derive_end; ok (size == 20, "got %lu\n", size); @@ -3531,7 +3529,7 @@ static void test_DH(void) ok(key != NULL, "key not set\n"); status = BCryptFinalizeKeyPair(key, 0); - todo_wine ok(status == STATUS_SUCCESS, "got %#lx\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); if (status != STATUS_SUCCESS) { BCryptDestroyKey(key); @@ -4311,7 +4309,6 @@ static void test_SecretAgreement(void) ok(status == STATUS_INVALID_PARAMETER, "got %#lx\n", status); status = BCryptDeriveKey(secret, L"HASH", NULL, NULL, 0, &size, 0); - todo_wine ok(status == STATUS_SUCCESS, "got %#lx\n", status); status = BCryptDestroyHash(secret); @@ -4353,7 +4350,7 @@ static void test_SecretAgreement(void) BCryptCloseAlgorithmProvider(alg, 0); return; } - todo_wine ok(status == STATUS_SUCCESS, "got %#lx\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); status = BCryptSecretAgreement(key, key, &secret, 0); ok(status == STATUS_SUCCESS, "got %#lx\n", status); @@ -4362,7 +4359,7 @@ static void test_SecretAgreement(void) ok(status == STATUS_SUCCESS, "got %#lx\n", status); status = BCryptDeriveKey(secret, L"HASH", NULL, NULL, 0, &size, 0); - todo_wine ok(status == STATUS_SUCCESS, "got %#lx\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); status = BCryptDestroySecret(secret); ok(status == STATUS_SUCCESS, "got %#lx\n", status); @@ -4460,7 +4457,7 @@ static void test_SecretAgreement(void) ok(size == sizeof(BCRYPT_DH_KEY_BLOB) + length / 8 * 3, "Got unexpected size %lu.\n", size); ok(dh_key_blob->dwMagic == BCRYPT_DH_PUBLIC_MAGIC, "Got unexpected dwMagic %#lx.\n", dh_key_blob->dwMagic); ok(dh_key_blob->cbKey == length / 8, "Got unexpected length %lu.\n", dh_key_blob->cbKey); - todo_wine ok(!memcmp(dh_key_blob + 1, dh_private_key, length / 8 * 2), "DH parameters do not match.\n"); + ok(!memcmp(dh_key_blob + 1, dh_private_key, length / 8 * 2), "DH parameters do not match.\n"); ok(memcmp((BYTE *)(dh_key_blob + 1) + length / 8 * 2, (BYTE *)dh_private_key + length / 8 * 2, length / 8), "Random public key data matches.\n"); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index aebca7727b9..6efb61cc328 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5694,6 +5694,7 @@ static void test_fog_special(void) ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr); color = get_surface_color(rt, 310, 240); + todo_wine_if(i == 1) ok(compare_color(color, tests[i].color_left, 1), "Expected left color 0x%08x, got 0x%08x, case %u.\n", tests[i].color_left, color, i); color = get_surface_color(rt, 330, 240); diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 68b92f0fc63..6730dc8100d 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-bookworm + image: $CI_REGISTRY/wine/wine:debian-trixie interruptible: true variables: GIT_DEPTH: 0 @@ -101,7 +101,7 @@ build-sast: build-winetest: stage: build - image: $CI_REGISTRY/wine/wine:debian-bookworm + image: $CI_REGISTRY/wine/wine:debian-trixie rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' needs: @@ -151,7 +151,7 @@ build-daily-mac: build-daily-winetest: stage: build - image: $CI_REGISTRY/wine/wine:debian-bookworm + image: $CI_REGISTRY/wine/wine:debian-trixie rules: - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH needs: diff --git a/tools/gitlab/image-amd64.docker b/tools/gitlab/image-amd64.docker index 4697c28986b..123085d9ceb 100644 --- a/tools/gitlab/image-amd64.docker +++ b/tools/gitlab/image-amd64.docker @@ -29,7 +29,6 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ libgphoto2-dev:amd64 libgphoto2-dev:i386 \ libice-dev:amd64 libice-dev:i386 \ libkrb5-dev:amd64 libkrb5-dev:i386 \ - libosmesa6-dev:amd64 libosmesa6-dev:i386 \ libpcap-dev:amd64 libpcap-dev:i386 \ libpcsclite-dev:amd64 \ libpulse-dev:amd64 libpulse-dev:i386 \ @@ -54,21 +53,14 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ libxrender-dev:amd64 libxrender-dev:i386 \ libxxf86vm-dev:amd64 libxxf86vm-dev:i386 \ linux-libc-dev:amd64 linux-libc-dev:i386 \ + libunwind-dev:amd64 \ ocl-icd-opencl-dev:amd64 ocl-icd-opencl-dev:i386 \ samba-dev:amd64 \ unixodbc-dev:amd64 unixodbc-dev:i386 \ x11proto-dev && \ apt-get install -y ccache netbase curl ca-certificates xserver-xorg-video-dummy xserver-xorg xfonts-base xinit fvwm \ - winbind fonts-liberation2 fonts-noto-core fonts-noto-cjk pulseaudio unzip && \ - curl -O https://www.deb-multimedia.org/pool/main/d/deb-multimedia-keyring/deb-multim... && \ - dpkg -i deb-multimedia-keyring_2024.9.1_all.deb && \ - echo 'deb https://www.deb-multimedia.org bookworm main' >> /etc/apt/sources.list && \ - apt-get update && \ - apt-get install -y libgstreamer-plugins-base1.0-dev:amd64 libgstreamer-plugins-base1.0-dev:i386 \ - libasound2-plugins:amd64 libasound2-plugins:i386 \ - libmjpegutils-2.1-0:amd64 libmjpegutils-2.1-0:i386 \ - gstreamer1.0-libav:amd64 gstreamer1.0-libav:i386 \ - gstreamer1.0-plugins-base:amd64 gstreamer1.0-plugins-good:amd64 gstreamer1.0-plugins-bad:amd64 gstreamer1.0-plugins-ugly:amd64 \ + winbind fonts-liberation2 fonts-noto-core fonts-noto-cjk pulseaudio unzip \ + libgstreamer-plugins-base1.0-dev:i386 libasound2-plugins:i386 libmjpegutils-2.1-0:i386 gstreamer1.0-libav:i386 \ gstreamer1.0-plugins-base:i386 gstreamer1.0-plugins-good:i386 gstreamer1.0-plugins-bad:i386 gstreamer1.0-plugins-ugly:i386 && \ apt-get clean && \ curl -L -o /usr/local/bin/sarif-converter https://gitlab.com/ignis-build/sarif-converter/-/releases/permalink/latest/d... && \ diff --git a/tools/gitlab/image-arm64.docker b/tools/gitlab/image-arm64.docker index 3bff22759ed..bb78b86a1fd 100644 --- a/tools/gitlab/image-arm64.docker +++ b/tools/gitlab/image-arm64.docker @@ -22,15 +22,11 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ libxext-dev libxi-dev libxinerama-dev libxkbcommon-dev \ libxkbregistry-dev libxrandr-dev libxrender-dev libxxf86vm-dev \ linux-libc-dev ocl-icd-opencl-dev samba-dev unixodbc-dev \ + libgstreamer-plugins-base1.0-dev libasound2-plugins libmjpegutils-2.1-0 gstreamer1.0-libav \ + gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly \ x11proto-dev && \ apt-get install -y ccache netbase curl ca-certificates xserver-xorg-video-dummy xserver-xorg xfonts-base xinit fvwm \ winbind fonts-liberation2 fonts-noto-core fonts-noto-cjk pulseaudio unzip && \ - curl -O https://www.deb-multimedia.org/pool/main/d/deb-multimedia-keyring/deb-multim... && \ - dpkg -i deb-multimedia-keyring_2024.9.1_all.deb && \ - echo 'deb https://www.deb-multimedia.org bookworm main' >> /etc/apt/sources.list && \ - apt-get update && \ - apt-get install -y libgstreamer-plugins-base1.0-dev libasound2-plugins libmjpegutils-2.1-0 gstreamer1.0-libav \ - gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly && \ apt-get clean && \ curl -s -L https://github.com/mstorsjo/llvm-mingw/releases/download/20250613/llvm-mingw... | tar xJ && \ mv llvm-mingw-20250613-ucrt-ubuntu-22.04-aarch64 /usr/local/llvm-mingw && \ diff --git a/tools/gitlab/image.yml b/tools/gitlab/image.yml index 75f0c727893..f149de0f162 100644 --- a/tools/gitlab/image.yml +++ b/tools/gitlab/image.yml @@ -3,7 +3,8 @@ .build-image: stage: image rules: - - if: $CI_PIPELINE_SOURCE == 'push' && $CI_PROJECT_PATH == "wine/wine" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' +# - if: $CI_PIPELINE_SOURCE == 'push' && $CI_PROJECT_PATH == "wine/wine" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH changes: - tools/gitlab/image.yml - tools/gitlab/image-amd64.docker @@ -12,8 +13,8 @@ name: gcr.io/kaniko-project/executor:debug entrypoint: [""] variables: - IMAGE_SOURCE: "$CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX/debian:bookworm" - IMAGE_LOCAL: "$CI_REGISTRY_IMAGE:debian-bookworm-$ARCH" + IMAGE_SOURCE: "$CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX/debian:trixie" + IMAGE_LOCAL: "$CI_REGISTRY_IMAGE:debian-trixie-$ARCH" DOCKER_FILE: "$CI_PROJECT_DIR/tools/gitlab/image-$ARCH.docker" script: - mkdir -p /kaniko/.docker @@ -42,4 +43,4 @@ build-image: script: - curl -s -L https://github.com/estesp/manifest-tool/releases/download/v2.2.0/binaries-ma... | tar xz manifest-tool-linux-amd64 - ./manifest-tool-linux-amd64 --username "${CI_REGISTRY_USER}" --password "${CI_REGISTRY_PASSWORD}" push from-args - --platforms linux/amd64,linux/arm64 --template ${CI_REGISTRY_IMAGE}:debian-bookworm-ARCH --target ${CI_REGISTRY_IMAGE}:debian-bookworm + --platforms linux/amd64,linux/arm64 --template ${CI_REGISTRY_IMAGE}:debian-trixie-ARCH --target ${CI_REGISTRY_IMAGE}:debian-trixie diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index 03d85b50ec7..ed34e9f071f 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-bookworm + image: $CI_REGISTRY/wine/wine:debian-trixie interruptible: true variables: GIT_STRATEGY: none -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8832
This merge request was approved by Elizabeth Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8832
participants (3)
-
Alexandre Julliard -
Alexandre Julliard (＠julliard)
-
Elizabeth Figura (＠zfigura)