remove traces of openssl@1.1

launchdarkly · Sep 20, 2023 · 8a4f8f9 · 8a4f8f9
1 parent adba16d
commit 8a4f8f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/actions/sdk-release/action.yml b/.github/actions/sdk-release/action.yml
@@ -155,9 +155,8 @@ runs:
       if: runner.os == 'macOS'
       shell: bash
       run: |
-        brew link --overwrite openssl@1.1
-        echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl@1.1)" >> "$GITHUB_ENV"
-        export OPENSSL_ROOT_DIR=$(brew --prefix openssl@1.1)
+        echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl@3)" >> "$GITHUB_ENV"
+        export OPENSSL_ROOT_DIR=$(brew --prefix openssl@3)
         
         ./scripts/build-release.sh ${{ inputs.sdk_cmake_target }}
       env:

diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml
@@ -41,7 +41,6 @@ jobs:
     runs-on: macos-12
     steps:
       - run: |
-          brew link --overwrite openssl@3
           echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl@3)" >> "$GITHUB_ENV"
           # For debugging
           echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl@3)"
@@ -55,6 +54,10 @@ jobs:
   build-test-windows:
     runs-on: windows-2022
     steps:
+      - name: Upgrade OpenSSL
+        shell: bash
+        run: |
+          choco upgrade openssl
       - uses: actions/checkout@v3
       - uses: ilammy/msvc-dev-cmd@v1
       - uses: ./.github/actions/ci