From 1a3fac9427afe04ac47749840975ec919bfa5acd Mon Sep 17 00:00:00 2001 From: Showns <116365846+AlbertShown@users.noreply.github.com> Date: Mon, 20 Oct 2025 11:46:02 -0400 Subject: [PATCH 1/6] Install and verify OpenSSL in Windows workflow Added steps to install and verify OpenSSL in the workflow. --- .github/workflows/windows.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 74819d608..4acbadfd4 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -48,6 +48,13 @@ jobs: path: bridge/webui_bridge.h key: ${{ runner.os }}-${{ github.sha }}-bridge fail-on-cache-miss: true + - name: Install OpenSSL + shell: pwsh + run: | + irm https://raw.githubusercontent.com/actions/runner-images/main/images/win/scripts/Installers/Install-OpenSSL.ps1 | iex + - name: Verify OpenSSL + shell: pwsh + run: dir "C:\Program Files\OpenSSL\lib" - uses: microsoft/setup-msbuild@v2 - uses: ilammy/msvc-dev-cmd@v1 if: matrix.cc == 'msvc' From f0df669a0b477d7af68dea65eda5e9a3cecda5c7 Mon Sep 17 00:00:00 2001 From: Showns <116365846+AlbertShown@users.noreply.github.com> Date: Mon, 20 Oct 2025 11:50:19 -0400 Subject: [PATCH 2/6] Update OpenSSL installation script URL --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4acbadfd4..652feabe3 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -51,7 +51,7 @@ jobs: - name: Install OpenSSL shell: pwsh run: | - irm https://raw.githubusercontent.com/actions/runner-images/main/images/win/scripts/Installers/Install-OpenSSL.ps1 | iex + irm https://raw.githubusercontent.com/actions/runner-images/refs/heads/main/images/windows/scripts/build/Install-OpenSSL.ps1 | iex - name: Verify OpenSSL shell: pwsh run: dir "C:\Program Files\OpenSSL\lib" From 7c4c51baa5fd05f9247632ff3daa68152d4ab265 Mon Sep 17 00:00:00 2001 From: Showns <116365846+AlbertShown@users.noreply.github.com> Date: Mon, 20 Oct 2025 13:51:13 -0400 Subject: [PATCH 3/6] Comment out OpenSSL installation in windows.yml Comment out the OpenSSL installation step in the workflow. --- .github/workflows/windows.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 652feabe3..ad60cda77 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -48,10 +48,10 @@ jobs: path: bridge/webui_bridge.h key: ${{ runner.os }}-${{ github.sha }}-bridge fail-on-cache-miss: true - - name: Install OpenSSL - shell: pwsh - run: | - irm https://raw.githubusercontent.com/actions/runner-images/refs/heads/main/images/windows/scripts/build/Install-OpenSSL.ps1 | iex + # - name: Install OpenSSL + # shell: pwsh + # run: | + # irm https://raw.githubusercontent.com/actions/runner-images/refs/heads/main/images/windows/scripts/build/Install-OpenSSL.ps1 | iex - name: Verify OpenSSL shell: pwsh run: dir "C:\Program Files\OpenSSL\lib" From 883c3c3f69a2c9b3428a87ef067b055818b8bd35 Mon Sep 17 00:00:00 2001 From: Showns <116365846+AlbertShown@users.noreply.github.com> Date: Mon, 20 Oct 2025 13:56:14 -0400 Subject: [PATCH 4/6] Update OpenSSL library path in Windows workflow --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ad60cda77..eff2887f6 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -40,7 +40,7 @@ jobs: env: ARTIFACT: webui-windows-${{ matrix.cc }}-x64 WEBUI_TLS_INCLUDE: "C:\\Program Files\\OpenSSL\\include" - WEBUI_TLS_LIB: "C:\\Program Files\\OpenSSL\\lib" + WEBUI_TLS_LIB: "C:\\Program Files\\OpenSSL\\lib\\VC" steps: - uses: actions/checkout@v4 - uses: actions/cache/restore@v4 @@ -54,7 +54,7 @@ jobs: # irm https://raw.githubusercontent.com/actions/runner-images/refs/heads/main/images/windows/scripts/build/Install-OpenSSL.ps1 | iex - name: Verify OpenSSL shell: pwsh - run: dir "C:\Program Files\OpenSSL\lib" + run: dir "C:\Program Files\OpenSSL\lib\VC" - uses: microsoft/setup-msbuild@v2 - uses: ilammy/msvc-dev-cmd@v1 if: matrix.cc == 'msvc' From 06f606c5eb67239a561331d468551b64e0927ab6 Mon Sep 17 00:00:00 2001 From: Showns <116365846+AlbertShown@users.noreply.github.com> Date: Mon, 20 Oct 2025 13:59:21 -0400 Subject: [PATCH 5/6] Update OpenSSL library path for x64 architecture --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index eff2887f6..c3567c87e 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -40,7 +40,7 @@ jobs: env: ARTIFACT: webui-windows-${{ matrix.cc }}-x64 WEBUI_TLS_INCLUDE: "C:\\Program Files\\OpenSSL\\include" - WEBUI_TLS_LIB: "C:\\Program Files\\OpenSSL\\lib\\VC" + WEBUI_TLS_LIB: "C:\\Program Files\\OpenSSL\\lib\\VC\\x64" steps: - uses: actions/checkout@v4 - uses: actions/cache/restore@v4 @@ -54,7 +54,7 @@ jobs: # irm https://raw.githubusercontent.com/actions/runner-images/refs/heads/main/images/windows/scripts/build/Install-OpenSSL.ps1 | iex - name: Verify OpenSSL shell: pwsh - run: dir "C:\Program Files\OpenSSL\lib\VC" + run: dir "C:\Program Files\OpenSSL\lib\VC\x64" - uses: microsoft/setup-msbuild@v2 - uses: ilammy/msvc-dev-cmd@v1 if: matrix.cc == 'msvc' From f4daeb1eee5c1fdc5d90a365cdd565c2a611b25e Mon Sep 17 00:00:00 2001 From: Showns <116365846+AlbertShown@users.noreply.github.com> Date: Mon, 20 Oct 2025 14:02:36 -0400 Subject: [PATCH 6/6] Update OpenSSL library path in Windows workflow --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c3567c87e..d4d107538 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -40,7 +40,7 @@ jobs: env: ARTIFACT: webui-windows-${{ matrix.cc }}-x64 WEBUI_TLS_INCLUDE: "C:\\Program Files\\OpenSSL\\include" - WEBUI_TLS_LIB: "C:\\Program Files\\OpenSSL\\lib\\VC\\x64" + WEBUI_TLS_LIB: "C:\\Program Files\\OpenSSL\\lib\\VC\\x64\\MD" steps: - uses: actions/checkout@v4 - uses: actions/cache/restore@v4 @@ -54,7 +54,7 @@ jobs: # irm https://raw.githubusercontent.com/actions/runner-images/refs/heads/main/images/windows/scripts/build/Install-OpenSSL.ps1 | iex - name: Verify OpenSSL shell: pwsh - run: dir "C:\Program Files\OpenSSL\lib\VC\x64" + run: dir "C:\Program Files\OpenSSL\lib\VC\x64\MD" - uses: microsoft/setup-msbuild@v2 - uses: ilammy/msvc-dev-cmd@v1 if: matrix.cc == 'msvc'