From 4a518cebffec347226682b2c831ce2460ef444bb Mon Sep 17 00:00:00 2001 From: Andrew Dinh Date: Mon, 28 Jul 2025 18:17:09 +0700 Subject: [PATCH] Fix msquic-openssl workflow to build container correctly MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - Fix inline file replacement on qns.Dockerfile - Add check to ensure patch ran successfully Reviewed-by: Neil Horman Reviewed-by: Saša Nedvědický (Merged from https://github.com/openssl/openssl/pull/28140) --- .github/workflows/build_quic_interop_container.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_quic_interop_container.yml b/.github/workflows/build_quic_interop_container.yml index d7b20692d8..30fd99bb34 100644 --- a/.github/workflows/build_quic_interop_container.yml +++ b/.github/workflows/build_quic_interop_container.yml @@ -38,7 +38,8 @@ jobs: docker login -u openssl-ci+machine -p ${{ secrets.QUAY_IO_PASSWORD }} quay.io - name: Patch qns.Dockerfile run: | - sed 's/RUN cmake -DQUIC_BUILD_TOOLS=on -DQUIC_ENABLE_LOGGING=on ../RUN cmake -DQUIC_BUILD_TOOLS=on -DQUIC_ENABLE_LOGGING=on -DQUIC_TLS_LIB=openssl ../' ./scripts/qns.Dockerfile + sed -i 's/RUN cmake -DQUIC_BUILD_TOOLS=on -DQUIC_ENABLE_LOGGING=on ../RUN cmake -DQUIC_BUILD_TOOLS=on -DQUIC_ENABLE_LOGGING=on -DQUIC_TLS_LIB=openssl ../' ./scripts/qns.Dockerfile + if grep -q "RUN cmake -DQUIC_BUILD_TOOLS=on -DQUIC_ENABLE_LOGGING=on -DQUIC_TLS_LIB=openssl .." ./scripts/qns.Dockerfile; then echo "Patched successfully"; else exit 1; fi - name: "Build container" run: | docker build -f ./scripts/qns.Dockerfile -t quay.io/openssl-ci/msquic-openssl:latest . -- 2.47.2