Windows: Fix workflows OpenSSL install

obgm · Oct 4, 2023 · 9fbce39 · 9fbce39
1 parent 342a2d0
commit 9fbce39
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,7 +15,6 @@ on:
 env:
   PLATFORM: posix
   TESTS: yes
-  OPENSSL_INSTALL_PATH: C:\Program Files\OpenSSL-Win64\
 
 jobs:
   build-linux:
@@ -156,8 +155,7 @@ jobs:
         uses: microsoft/setup-msbuild@v1
 
       - name: Install OpenSSL on Windows (choco)
-        run: |
-          choco install openssl
+        run: call .\scripts\msinstallopenssl.cmd
         shell: cmd
 
       - name: Build sln
@@ -169,8 +167,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Install OpenSSL on Windows (choco)
-      run: |
-        choco install openssl
+      run: call .\scripts\msinstallopenssl.cmd
       shell: cmd
 
     - name: MS CMake setup

diff --git a/scripts/msbuild.sln.cmd b/scripts/msbuild.sln.cmd
@@ -8,6 +8,15 @@ if exist NoTLS rd /s /q NoTLS
 
 cd ..
 
+REM Need to set OPENSSL_INSTALL_PATH so we can build with OpenSSL
+IF EXIST "C:\Program Files\OpenSSL\include\openssl\ssl.h" (
+  SET "OPENSSL_INSTALL_PATH=C:\Program Files\OpenSSL\"
+) ELSE (
+  SET "OPENSSL_INSTALL_PATH=C:\Program Files\OpenSSL-Win64\")
+)
+
+echo OPENSSL_INSTALL_PATH = %OPENSSL_INSTALL_PATH%
+
 rem MSBuild.exe ./win32/libcoap.sln /p:Configuration=NoTLS /p:Platform=x64 /warnaserror
 MSBuild.exe ./win32/libcoap.sln /p:Platform=x64 /warnaserror
 

diff --git a/scripts/msinstallopenssl.cmd b/scripts/msinstallopenssl.cmd
@@ -0,0 +1,5 @@
+IF NOT EXIST "C:\Program Files\OpenSSL\include\openssl\ssl.h" (
+  choco install openssl --no-progress
+) ELSE (
+  echo OpenSSL already installed.
+)