OpenSSL 3.0 CI on Windows

Author: mtrojnar

.github/workflows/ci.yml

@@ -5,21 +5,21 @@ on:
   pull_request:
 
 env:
-  version: libp11-0.4.13_git
+  version: 0.4.13_git
 
 jobs:
-  unix-build:
+  unix:
     strategy:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-22.04
-          - os: ubuntu-20.04
-          - os: ubuntu-18.04
-          - os: macOS-latest
-            openssl: openssl@3
-          - os: macOS-latest
-            openssl: [email protected]
+          - os: 'ubuntu-22.04'
+          - os: 'ubuntu-20.04'
+          - os: 'ubuntu-18.04'
+          - os: 'macOS-latest'
+            openssl: 'openssl@3'
+          - os: 'macOS-latest'
+            openssl: '[email protected]'
 
     runs-on: ${{matrix.os}}
 
@@ -61,31 +61,60 @@ jobs:
       if: failure()
       run: cat tests/test-suite.log || true
 
-  windows-build:
+  windows:
     strategy:
       fail-fast: false
       matrix:
         include:
-          - arch: x86
-            choco_param: --x86
-            build_for: WIN32
-            openssl_dir: C:\Program Files (x86)\OpenSSL-Win32
-          - arch: x64
-            build_for: WIN64
-            openssl_dir: C:\Program Files\OpenSSL-Win64
+          - arch: 'x86'
+            openssl_version: '1.1.1'
+            choco_param: '--x86'
+            build_for: 'WIN32'
+            openssl_dir: 'C:\Program Files (x86)\OpenSSL-Win32'
+          - arch: 'x64'
+            openssl_version: '1.1.1'
+            build_for: 'WIN64'
+            openssl_dir: 'C:\Program Files\OpenSSL-Win64'
+          - arch: 'x86'
+            openssl_version: '3.0'
+            build_for: 'WIN32'
+            openssl_dir: 'C:\vcpkg\packages\openssl_x86-windows'
+          - arch: 'x64'
+            openssl_version: '3.0'
+            build_for: 'WIN64'
+            openssl_dir: 'C:\vcpkg\packages\openssl_x64-windows'
 
     runs-on: windows-latest
 
     steps:
     - uses: actions/checkout@v3
 
+    - name: Cache the vcpkg archives
+      if: matrix.openssl_version == '3.0'
+      uses: actions/cache@v3
+      with:
+        path: C:/Users/runneradmin/AppData/Local/vcpkg/archives
+        key: ${{matrix.arch}}-${{matrix.openssl_version}}
+
     - name: Configure Visual Studio
       uses: ilammy/msvc-dev-cmd@v1
       with:
         arch: ${{matrix.arch}}
 
-    - name: Install Chocolatey dependencies
-      run: choco install ${{matrix.choco_param}} -y openssl
+    - name: Install OpenSSL 1.1.1 with Chocolatey
+      if: matrix.openssl_version == '1.1.1'
+      run: |
+        choco install ${{matrix.choco_param}} -y openssl
+        echo "${{matrix.openssl_dir}}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+    - name: Install OpenSSL 3.0 with VCPKG
+      if: matrix.openssl_version == '3.0'
+      run: |
+        vcpkg install --triplet=${{matrix.arch}}-windows openssl
+        echo "${{matrix.openssl_dir}}\tools\openssl" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+    - name: Show OpenSSL version
+      run: openssl version -a
 
     - name: Build
       run: nmake -f Makefile.mak
@@ -95,5 +124,5 @@ jobs:
     - name: Upload the DLLs
       uses: actions/upload-artifact@v3
       with:
-        name: ${{env.version}}-openssl-1.1.1-${{matrix.arch}}
+        name: libp11-${{env.version}}-openssl-${{matrix.openssl_version}}-${{matrix.arch}}
         path: ${{github.workspace}}/src/*.dll

make.rules.mak

@@ -43,6 +43,6 @@ OPENSSL_LIB = $(OPENSSL_DIR)\lib\VC\static\libcryptoMT$(DEBUG_SUFFIX).lib
 
 LIBS = "$(OPENSSL_LIB)" ws2_32.lib user32.lib advapi32.lib crypt32.lib gdi32.lib
 
-CFLAGS = /NOLOGO /GS /W3 /D_CRT_SECURE_NO_DEPRECATE /MT$(DEBUG_SUFFIX) $(OPENSSL_INC) /D_WIN32_WINNT=0x0600 /DWIN32_LEAN_AND_MEAN $(DEBUG_COMPILE)
+CFLAGS = /nologo /GS /W3 /D_CRT_SECURE_NO_DEPRECATE /MT$(DEBUG_SUFFIX) $(OPENSSL_INC) /D_WIN32_WINNT=0x0600 /DWIN32_LEAN_AND_MEAN $(DEBUG_COMPILE)
 
 LINKFLAGS = /NOLOGO /INCREMENTAL:NO $(MACHINE) /MANIFEST:NO /NXCOMPAT /DYNAMICBASE $(DEBUG_LINK)