From 5633d4eb8c0eee4ea5e8ae16a0d71e0d341bb74c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Trojnara?= <Michal.Trojnara@stunnel.org>
Date: Mon, 4 Mar 2024 18:41:18 +0100
Subject: [PATCH] Remove CI on unsupported OpenSSL versions

---
 .github/workflows/ci.yml | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 26146e64..c6fa75eb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -68,22 +68,9 @@ jobs:
       matrix:
         include:
           - 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'
-            # Use OpenSSL from PostgreSQL, because Chocolatey is broken
-            #openssl_dir: 'C:\Program Files\OpenSSL-Win64'
-            openssl_dir: 'C:\Program Files\PostgreSQL\14'
-          - 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'
 
@@ -93,25 +80,17 @@ jobs:
     - 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}}
+        key: ${{matrix.arch}}
 
     - name: Configure Visual Studio
       uses: ilammy/msvc-dev-cmd@v1
       with:
         arch: ${{matrix.arch}}
 
-    - 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'
+    - name: Install OpenSSL with VCPKG
       run: |
         vcpkg install --triplet=${{matrix.arch}}-windows openssl
         echo "${{matrix.openssl_dir}}\tools\openssl" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
@@ -127,5 +106,5 @@ jobs:
     - name: Upload the DLLs
       uses: actions/upload-artifact@v3
       with:
-        name: libp11-${{env.version}}-openssl-${{matrix.openssl_version}}-${{matrix.arch}}
+        name: libp11-${{env.version}}-openssl-${{matrix.arch}}
         path: ${{github.workspace}}/src/*.dll