From a92a92600ebe44db02861c871873f84fa63cc79e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 10 Dec 2025 00:09:02 +0000 Subject: [PATCH 1/3] Initial plan From 34f96774a6938f6bf73915cf93517762b4d04120 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 10 Dec 2025 00:14:07 +0000 Subject: [PATCH 2/3] Add openSUSE 15.6 back with testing feed Co-authored-by: richlander <2608468+richlander@users.noreply.github.com> --- src/opensuse/15.6/helix/amd64/Dockerfile | 12 ++++++++---- src/opensuse/manifest.json | 13 +++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/opensuse/15.6/helix/amd64/Dockerfile b/src/opensuse/15.6/helix/amd64/Dockerfile index c67610a49..6b9123fef 100644 --- a/src/opensuse/15.6/helix/amd64/Dockerfile +++ b/src/opensuse/15.6/helix/amd64/Dockerfile @@ -1,4 +1,7 @@ FROM opensuse/leap:15.6 +# Using RC version from testing feed as it has correct dependencies (libcrypto.so.3) +# The production feed versions depend on libcrypto.so.1.1 which is incompatible +ARG LIBMSQUIC_VERSION=2.4.17~rc2 # Install Helix Dependencies RUN zypper ref \ @@ -36,13 +39,14 @@ RUN zypper ref \ ENV LANG=en_US.utf8 # Install MsQuic from official GitHub releases +# Using opensuse15 testing feed as it's compatible with openSUSE 15.6 +# See: https://github.com/microsoft/msquic/issues/5567#issuecomment-3618761370 RUN wget https://packages.microsoft.com/keys/microsoft.asc \ && rpm --import microsoft.asc \ && rm microsoft.asc \ - && zypper addrepo https://packages.microsoft.com/opensuse/15/prod/ "MS Packages" \ - && zypper install -y \ - libmsquic \ - && zypper clean -a + && wget "https://packages.microsoft.com/yumrepos/microsoft-opensuse15-testing-prod/Packages/l/libmsquic-${LIBMSQUIC_VERSION}-1.x86_64.rpm" \ + && rpm -i libmsquic-${LIBMSQUIC_VERSION}-1.x86_64.rpm \ + && rm libmsquic-${LIBMSQUIC_VERSION}-1.x86_64.rpm RUN ln -sf /usr/bin/python3.12 /usr/bin/python diff --git a/src/opensuse/manifest.json b/src/opensuse/manifest.json index 46a323426..2c8de3a20 100644 --- a/src/opensuse/manifest.json +++ b/src/opensuse/manifest.json @@ -7,6 +7,19 @@ "platforms": [ ] }, + { + "platforms": [ + { + "architecture": "amd64", + "dockerfile": "src/opensuse/15.6/helix/amd64", + "os": "linux", + "osVersion": "leap15.6", + "tags": { + "opensuse-15.6-helix-amd64": {} + } + } + ] + }, { "platforms": [ { From 727f03e6c1929e348e4ce10112e08d9629f4b522 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 10 Dec 2025 00:25:16 +0000 Subject: [PATCH 3/3] Remove empty platforms entry from opensuse manifest Co-authored-by: richlander <2608468+richlander@users.noreply.github.com> --- src/opensuse/manifest.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/opensuse/manifest.json b/src/opensuse/manifest.json index 2c8de3a20..17a658ed2 100644 --- a/src/opensuse/manifest.json +++ b/src/opensuse/manifest.json @@ -3,10 +3,6 @@ { "name": "dotnet-buildtools/prereqs", "images": [ - { - "platforms": [ - ] - }, { "platforms": [ {