feat(cubestore): Build binary with static linking for OpenSSL

cube-js · Feb 27, 2021 · 5cd961f · 5cd961f
1 parent 5702cc4
commit 5cd961f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 24 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -239,17 +239,16 @@ jobs:
       - run: source .github/actions/${{ matrix.before_script }}.sh
         if: ${{ matrix.before_script }}
         shell: bash
-      - name: Install dependencies Windows
-        run: vcpkg integrate install; vcpkg install openssl:x64-windows
-        if: matrix.os == 'windows-latest'
-        env:
-          VCPKG_ROOT: 'C:\vcpkg'
-      - name: Set Env Variables for Musl
+      #- name: Install dependencies Windows
+      #  run: vcpkg integrate install; vcpkg install openssl:x64-windows
+      #  if: matrix.os == 'windows-latest'
+      #  env:
+      #    VCPKG_ROOT: 'C:\vcpkg'
+      - name: Set Env Variables for Darwin
         uses: allenevans/set-env@v2.0.0
-        if: ${{ matrix.target == 'x86_64-unknown-linux-musl' }}
+        if: ${{ matrix.target == 'x86_64-apple-darwin' }}
         with:
           OPENSSL_STATIC: true
-          OPENSSL_DIR: "/musl"
       # https://github.com/actions-rs/cargo/issues/6
       #- uses: actions-rs/cargo@v1
       - uses: marcopolo/cargo@master

diff --git a/.github/workflows/rust-master.yml b/.github/workflows/rust-master.yml
@@ -195,17 +195,16 @@ jobs:
       - run: source .github/actions/${{ matrix.before_script }}.sh
         if: ${{ matrix.before_script }}
         shell: bash
-      - name: Install dependencies Windows
-        run: vcpkg integrate install; vcpkg install openssl:x64-windows
-        if: matrix.os == 'windows-latest'
-        env:
-          VCPKG_ROOT: 'C:\vcpkg'
-      - name: Set Env Variables for Musl
+      #- name: Install dependencies Windows
+      #  run: vcpkg integrate install; vcpkg install openssl:x64-windows
+      #  if: matrix.os == 'windows-latest'
+      #  env:
+      #    VCPKG_ROOT: 'C:\vcpkg'
+      - name: Set Env Variables for Darwin
         uses: allenevans/set-env@v2.0.0
-        if: ${{ matrix.target == 'x86_64-unknown-linux-musl' }}
+        if: ${{ matrix.target == 'x86_64-apple-darwin' }}
         with:
           OPENSSL_STATIC: true
-          OPENSSL_DIR: "/musl"
       # https://github.com/actions-rs/cargo/issues/6
       #- uses: actions-rs/cargo@v1
       - uses: marcopolo/cargo@master

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -138,17 +138,16 @@ jobs:
       - run: source .github/actions/${{ matrix.before_script }}.sh
         if: ${{ matrix.before_script }}
         shell: bash
-      - name: Install dependencies Windows
-        run: vcpkg integrate install; vcpkg install openssl:x64-windows
-        if: matrix.os == 'windows-latest'
-        env:
-          VCPKG_ROOT: 'C:\vcpkg'
-      - name: Set Env Variables for Musl
+      #- name: Install dependencies Windows
+      #  run: vcpkg integrate install; vcpkg install openssl:x64-windows
+      #  if: matrix.os == 'windows-latest'
+      #  env:
+      #    VCPKG_ROOT: 'C:\vcpkg'
+      - name: Set Env Variables for Darwin
         uses: allenevans/set-env@v2.0.0
-        if: ${{ matrix.target == 'x86_64-unknown-linux-musl' }}
+        if: ${{ matrix.target == 'x86_64-apple-darwin' }}
         with:
           OPENSSL_STATIC: true
-          OPENSSL_DIR: "/musl"
       # https://github.com/actions-rs/cargo/issues/6
       #- uses: actions-rs/cargo@v1
       - uses: marcopolo/cargo@master