Static linux builds

.github/actions/build/action.yml

@@ -43,6 +43,11 @@ runs:
       with:
         configurePreset: ci-${{ inputs.preset }}
         configurePresetAdditionalArgs: "[ `-B`, `./build` ]"
+
+    - name: hack force libpthread.a for static builds
+      if: contains(inputs.preset, 'static')
+      shell: bash
+      run: "grep -rl  ./build | xargs sed -i 's/libpthread.so/libpthread.a/g'"
 
     - name: build ziti-edge-tunnel
       shell: bash

.github/workflows/cmake.yml

@@ -55,6 +55,21 @@ jobs:
             name: Linux arm64
             preset: linux-arm64-static-libssl
 
+          - os: ubuntu-22.04
+            container: openziti/ziti-builder:v2
+            name: Linux x86_64
+            preset: linux-x64-static
+
+          - os: ubuntu-22.04
+            container: openziti/ziti-builder:v2
+            name: Linux arm
+            preset: linux-arm-static
+
+          - os: ubuntu-22.04
+            container: openziti/ziti-builder:v2
+            name: Linux arm64
+            preset: linux-arm64-static
+
     steps:
       - name: Debug action
         uses: hmarr/debug-action@v3

.github/workflows/release.yml

@@ -22,6 +22,18 @@ jobs:
         with:
           path: ${{ runner.workspace }}/downloads/
 
+      # This step is only necessary because we prefer a different release artifact name
+      # than is created by CMake, and so we could change the CMake configuration but for
+      # now this is easier. The pre-release build doesn't rename the artifacts.
+      - name: Rename bundle assets
+        working-directory: ${{ runner.workspace }}/downloads/
+        run: |
+          mv linux-arm64-static-libssl/ziti-edge-tunnel-Linux_aarch64.zip linux-arm64-static-libssl/ziti-edge-tunnel-Linux_arm64.zip
+          mv windows-x64-mingw/ziti-edge-tunnel-Windows_AMD64.zip windows-x64-mingw/ziti-edge-tunnel-Windows_x86_64.zip
+          mv linux-arm-static/ziti-edge-tunnel-Linux_arm.zip linux-arm-static/ziti-edge-tunnel-Linux_arm-static.zip
+          mv linux-arm64-static/ziti-edge-tunnel-Linux_aarch64.zip linux-arm64-static/ziti-edge-tunnel-Linux_arm64-static.zip
+          mv linux-x64-static/ziti-edge-tunnel-Linux_x86_64.zip linux-arm64-static/ziti-edge-tunnel-Linux_x86_64-static.zip
+
       - name: List Release Artifacts
         run: ls -horRAS ${{runner.workspace}}/downloads/
 
@@ -36,34 +48,15 @@ jobs:
           # token: defaults to github.token
           fail_on_unmatched_files: true
           files: |
+            ${{ runner.workspace }}/downloads/linux-arm-static/ziti-edge-tunnel-Linux_arm-static.zip
+            ${{ runner.workspace }}/downloads/linux-arm64-static/ziti-edge-tunnel-Linux_arm64-static.zip
+            ${{ runner.workspace }}/downloads/linux-arm64-static/ziti-edge-tunnel-Linux_x86_64-static.zip
             ${{ 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-arm64-static-libssl/ziti-edge-tunnel-Linux_arm64.zip
             ${{ runner.workspace }}/downloads/macOS-x64/ziti-edge-tunnel-Darwin_x86_64.zip
             ${{ runner.workspace }}/downloads/macOS-arm64/ziti-edge-tunnel-Darwin_arm64.zip
-
-      # These final two steps are only necessary because we prefer a different
-      # release artifact name than is created by CMake, and so we could change
-      # the CMake configuration or add an inline (shell) run step to manipulate
-      # the filenames. The pre-release build doesn't rename the artifacts.
-      - name: upload Linux ARM64 with different name
-        uses: actions/upload-release-asset@v1
-        env:
-          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_name: ziti-edge-tunnel-Linux_arm64.zip
-          asset_content_type: application/octet-stream
-
-      - name: upload Windows with different name
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ${{ runner.workspace }}/downloads/windows-x64-mingw/ziti-edge-tunnel-Windows_AMD64.zip
-          asset_name: ziti-edge-tunnel-Windows_x86_64.zip
-          asset_content_type: application/octet-stream
+            ${{ runner.workspace }}/downloads/windows-x64-mingw/ziti-edge-tunnel-Windows_x86_64.zip
 
       - name: Get the Version String from Git Tag
         id: get_version

CMakePresets.json

@@ -224,6 +224,31 @@
       "name": "ci-linux-arm-static-libssl",
       "inherits": [ "ci-linux-static-libssl", "ci-linux-arm" ]
     },
+    {
+      "name": "ci-linux-static",
+      "description": "preset to link executable against static libs",
+      "cacheVariables": {
+        "CMAKE_EXE_LINKER_FLAGS": "-static",
+        "BUILD_SHARED_LIBS": "OFF",
+        "ZLIB_USE_STATIC_LIBS": "ON",
+        "OPENSSL_USE_STATIC_LIBS": "ON",
+        "CMAKE_SUPPRESS_REGENERATION": "ON",
+        "CMAKE_FIND_LIBRARY_SUFFIXES": ".a"
+      },
+      "hidden": true
+    },
+    {
+      "name": "ci-linux-x64-static",
+      "inherits": [ "ci-linux-static", "ci-linux-static-libssl", "ci-linux-x64" ]
+    },
+    {
+      "name": "ci-linux-arm64-static",
+      "inherits": [ "ci-linux-static", "ci-linux-static-libssl", "ci-linux-arm64" ]
+    },
+    {
+      "name": "ci-linux-arm-static",
+      "inherits": [ "ci-linux-static", "ci-linux-static-libssl", "ci-linux-arm" ]
+    },
     {
       "name": "ci-windows-x64",
       "inherits": "ci-windows-x64-vs2022"