Merge pull request #139 from woocommerce/24-03/windows-ssl-alternate

Use Composer CA Bundle instead of custom implementation
woocommerce · Mar 7, 2024 · 433b76b · 433b76b
2 parents 49f7073 + aa77035
commit 433b76b
Show file tree

Hide file tree

Showing 5 changed files with 299 additions and 357 deletions.
diff --git a/.github/workflows/qit-windows.yml b/.github/workflows/qit-windows.yml
@@ -35,39 +35,10 @@ jobs:
         working-directory: src
         run: php qit-cli.php dev
 
-      - name: Run SSL connection without CA file fallback Test
+      - name: Run SSL connection without CA file
         working-directory: src
         env:
           OPENSSL_CONF: ''
-        run: |
-          php -d openssl.cafile='' -d curl.cainfo='' qit-cli.php sync -vvv
-          if ($LASTEXITCODE -ne 0) {
-            Write-Host "Test passed: SSL connection failed as expected"
-            $LASTEXITCODE = 0
-          } else {
-            Write-Host "Test failed: SSL connection did not fail as expected"
-            exit 1
-          }
-
-      - name: Run SSL connection with CA file fallback Test (Cache miss)
-        working-directory: src
-        env:
-          QIT_WINDOWS_DOWNLOAD_CA: yes
-          OPENSSL_CONF: ''
-        run: |
-          php -d openssl.cafile='' -d curl.cainfo='' qit-cli.php sync -vvv
-          if ($LASTEXITCODE -eq 0) {
-            Write-Host "Test passed: SSL connection succeeded"
-          } else {
-            Write-Host "Test failed: SSL connection did not succeed"
-            exit 1
-          }
-
-      - name: Run SSL connection with CA file fallback Test (Cache hit)
-        working-directory: src
-        env:
-          QIT_WINDOWS_DOWNLOAD_CA: yes
-          OPENSSL_CONF: ''
         run: |
           php -d openssl.cafile='' -d curl.cainfo='' qit-cli.php sync -vvv
           if ($LASTEXITCODE -eq 0) {

diff --git a/qit b/qit
diff --git a/src/composer.json b/src/composer.json
@@ -24,7 +24,8 @@
     "ext-zip": "*",
     "symfony/console": "^5",
     "lucatume/di52": "^3",
-    "stecman/symfony-console-completion": "^0.11.0"
+    "stecman/symfony-console-completion": "^0.11.0",
+    "composer/ca-bundle": "^1.4"
   },
   "require-dev": {
     "phpunit/phpunit": "^8",