use --with-secure-transport to build libcurl on macos

Kong · Dec 11, 2023 · a8a046e · a8a046e
1 parent 2d0a3fa
commit a8a046e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml
@@ -8,7 +8,7 @@ name: build-and-release
 on:
   push:
     tags:
-      - '*'
+      - "*"
     branches:
       - develop
 
@@ -84,12 +84,12 @@ jobs:
           key: v4-${{ runner.os }}-libcurl-deps-cache-node-${{ matrix.node }}-fork
           restore-keys: |
             v4-${{ runner.os }}-libcurl-deps-cache-node-${{ matrix.node }}-fork
-      - name: 'Set GIT_TAG'
+      - name: "Set GIT_TAG"
         if: startsWith(github.ref, 'refs/tags')
         run: echo "GIT_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-      - name: 'Publish Binary'
+      - name: "Publish Binary"
         run: |
-          GIT_COMMIT=${{ github.sha }} GIT_TAG=$GIT_TAG ./scripts/ci/build.sh
+          GIT_COMMIT=${{ github.sha }} GIT_TAG=$GIT_TAG RUNNER_OS=${{ runner.os }} ./scripts/ci/build.sh
       - name: Upload artifacts
         if: always()
         uses: actions/upload-artifact@v3
@@ -172,10 +172,10 @@ jobs:
           key: v4-${{ runner.os }}-libcurl-deps-cache-electron-${{ matrix.electron-version }}-fork
           restore-keys: |
             v4-${{ runner.os }}-libcurl-deps-cache-electron-${{ matrix.electron-version }}-fork
-      - name: 'Set GIT_TAG'
+      - name: "Set GIT_TAG"
         if: startsWith(github.ref, 'refs/tags')
         run: echo "GIT_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-      - name: 'Publish Binary'
+      - name: "Publish Binary"
         run: |
           GIT_COMMIT=${{ github.sha }} GIT_TAG=$GIT_TAG ./scripts/ci/build.sh
       - name: Upload artifacts
@@ -241,8 +241,8 @@ jobs:
       ELECTRON_VERSION: ${{ matrix.electron-version }}
       npm_config_msvs_version: 2022
       npm_config_build_from_source: true
-      npm_config_runtime: 'electron'
-      npm_config_dist_url: 'https://electronjs.org/headers'
+      npm_config_runtime: "electron"
+      npm_config_dist_url: "https://electronjs.org/headers"
       npm_config_target: ${{ matrix.electron-version }}
     steps:
       - name: Checkout

diff --git a/scripts/ci/build-libcurl.sh b/scripts/ci/build-libcurl.sh
@@ -134,7 +134,9 @@ fi
 #####
 # ssl
 ####
-if [ ! -z "$OPENSSL_BUILD_FOLDER" ]; then
+if [ "${RUNNER_OS}" == "macOS" ]; then
+  libcurl_args+=("--with-secure-transport")
+elif [ ! -z "$OPENSSL_BUILD_FOLDER" ]; then
   CPPFLAGS="$CPPFLAGS -I$OPENSSL_BUILD_FOLDER/include"
   LDFLAGS="$LDFLAGS -L$OPENSSL_BUILD_FOLDER/lib -Wl,-rpath,$OPENSSL_BUILD_FOLDER/lib"