don't use -static-libssl cmake presets when building with mbedtls (#720)

openziti · Aug 24, 2023 · cadbbc6 · cadbbc6
1 parent 5e2c362
commit cadbbc6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -41,17 +41,17 @@ jobs:
           - os: ubuntu-20.04
             container: openziti/ziti-builder:1.0.3
             name: Linux x86_64
-            preset: linux-x64-static-libssl
+            preset: linux-x64
 
           - os: ubuntu-20.04
             container: openziti/ziti-builder:1.0.3
             name: Linux arm
-            preset: linux-arm-static-libssl
+            preset: linux-arm
 
           - os: ubuntu-20.04
             container: openziti/ziti-builder:1.0.3
             name: Linux arm64
-            preset: linux-arm64-static-libssl
+            preset: linux-arm64
 
     steps:
       # only focal-20.04 has >= 2.18, which is required by actions/checkout to clone

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,8 +33,8 @@ jobs:
           prerelease: false
           fail_on_unmatched_files: true
           files: |
-            ${{ runner.workspace }}/downloads/linux-x64-static-libssl/ziti-edge-tunnel-Linux_x86_64.zip
-            ${{ runner.workspace }}/downloads/linux-arm-static-libssl/ziti-edge-tunnel-Linux_arm.zip
+            ${{ runner.workspace }}/downloads/linux-x64/ziti-edge-tunnel-Linux_x86_64.zip
+            ${{ runner.workspace }}/downloads/linux-arm/ziti-edge-tunnel-Linux_arm.zip
             ${{ runner.workspace }}/downloads/macOS-x64/ziti-edge-tunnel-Darwin_x86_64.zip
             ${{ runner.workspace }}/downloads/macOS-arm64/ziti-edge-tunnel-Darwin_arm64.zip
 
@@ -48,7 +48,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ${{ runner.workspace }}/downloads/linux-arm64-static-libssl/ziti-edge-tunnel-Linux_aarch64.zip
+          asset_path: ${{ runner.workspace }}/downloads/linux-arm64/ziti-edge-tunnel-Linux_aarch64.zip
           asset_name: ziti-edge-tunnel-Linux_arm64.zip
           asset_content_type: application/octet-stream