Added statically linked binaries (#51)

Author: MarcelCoding

.github/workflows/ci.yaml

@@ -20,6 +20,7 @@ jobs:
           - x86_64-unknown-linux-gnu
           - aarch64-unknown-linux-gnu
           - armv7-unknown-linux-gnueabihf
+        linker: [ static, dynamic ]
 
     steps:
       - uses: actions/checkout@v3
@@ -40,7 +41,8 @@ jobs:
 
       - run: cargo install --force cross --git https://github.com/cross-rs/cross
       - run: cargo install --force cargo-deb
-#      - run: cargo install --force cargo-generate-rpm
+        if: matrix.linker == 'dynamic'
+      #      - run: cargo install --force cargo-generate-rpm
 
       - name: Find Version
         if: startsWith(github.ref, 'refs/tags/')
@@ -59,43 +61,53 @@ jobs:
 
           sed -i'' "s/0\\.0\\.0-git/${{ steps.meta.outputs.version }}/" Cargo.lock
 
+      - name: Configure for static
+        run: |
+          if [[ '${{ matrix.linker }}' == 'static' ]]; then
+            echo 'RUSTFLAGS=-C target-feature=+crt-static' >> $GITHUB_ENV
+            echo 'NAME_PREFIX=_static' >> $GITHUB_ENV 
+          fi
+
       - name: Build
         run: cross build --release --target ${{ matrix.target }}
 
       - name: Build deb
+        if: matrix.linker == 'dynamic'
         run: |
           cargo deb --no-build --no-strip --target ${{ matrix.target }} -p zia-client
           cargo deb --no-build --no-strip --target ${{ matrix.target }} -p zia-server
 
-#      - name: Build rpm
-#        run: |
-#          cargo generate-rpm --target ${{ matrix.target }} -p zia-client
-#          cargo generate-rpm --target ${{ matrix.target }}  -p zia-server
+      #      - name: Build rpm
+      #        run: |
+      #          cargo generate-rpm --target ${{ matrix.target }} -p zia-client
+      #          cargo generate-rpm --target ${{ matrix.target }}  -p zia-server
 
       - name: Rename binary
         run: |
-          mv target/${{ matrix.target }}/release/zia-client zia-client_${{ matrix.target }}
-          mv target/${{ matrix.target }}/release/zia-server zia-server_${{ matrix.target }}
+          mv target/${{ matrix.target }}/release/zia-client zia-client_${{ matrix.target }}${{ env.NAME_PREFIX }}
+          mv target/${{ matrix.target }}/release/zia-server zia-server_${{ matrix.target }}${{ env.NAME_PREFIX }}
 
       - name: Upload Artifact (client)
         uses: actions/upload-artifact@v3
         with:
-          name: zia-client_${{ matrix.target }}
-          path: zia-client_${{ matrix.target }}*
+          name: zia-client_${{ matrix.target }}${{ env.NAME_PREFIX }}
+          path: zia-client_${{ matrix.target }}${{ env.NAME_PREFIX }}
 
       - name: Upload Artifact (server)
         uses: actions/upload-artifact@v3
         with:
-          name: zia-server_${{ matrix.target }}
-          path: zia-server_${{ matrix.target }}*
+          name: zia-server_${{ matrix.target }}${{ env.NAME_PREFIX }}
+          path: zia-server_${{ matrix.target }}${{ env.NAME_PREFIX }}
 
       - name: Upload Artifact deb (client)
+        if: matrix.linker == 'dynamic'
         uses: actions/upload-artifact@v3
         with:
           name: zia-client_${{ matrix.target }}.deb
           path: target/${{ matrix.target }}/debian/zia-client_*.deb
 
       - name: Upload Artifact deb (server)
+        if: matrix.linker == 'dynamic'
         uses: actions/upload-artifact@v3
         with:
           name: zia-server_${{ matrix.target }}.deb
@@ -106,7 +118,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
-          asset_paths: '["zia-client_${{ matrix.target }}","zia-server_${{ matrix.target }}","target/${{ matrix.target }}/debian/zia-client_${{ steps.meta.outputs.version }}_*.deb","target/${{ matrix.target }}/debian/zia-server_${{ steps.meta.outputs.version }}_*.deb"]'
+          asset_paths: '["zia-client_${{ matrix.target }}${{ env.NAME_PREFIX }}","zia-server_${{ matrix.target }}${{ env.NAME_PREFIX }}","target/${{ matrix.target }}/debian/zia-client_${{ steps.meta.outputs.version }}_*.deb","target/${{ matrix.target }}/debian/zia-server_${{ steps.meta.outputs.version }}_*.deb"]'
 
   build-native:
     needs: [ build ]

Cargo.lock

@@ -7,7 +7,7 @@ license = "AGPL-3.0"
 description = "Proxy udp over websocket, useful to use Wireguard in restricted networks."
 
 [dependencies]
-tokio = { version = "1.21", default-features = false, features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
+tokio = { version = "1.22", default-features = false, features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 tracing-subscriber = { version = "0.3", features = ["tracing-log"] }
 tokio-tungstenite = { version = "0.17", default-features = false }

zia-client/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 async-http-proxy = { version = "1.2", features = ["runtime-tokio", "basic-auth"] }
-tokio = { version = "1.21", default-features = false, features = ["net", "time"] }
+tokio = { version = "1.22", default-features = false, features = ["net", "time"] }
 tokio-tungstenite = { version = "0.17", default-features = false }
 futures-util = { version = "0.3", default-features = false }
 tokio-rustls = "0.23"

zia-common/Cargo.toml

@@ -7,7 +7,7 @@ license = "AGPL-3.0"
 description = "Proxy udp over websocket, useful to use Wireguard in restricted networks."
 
 [dependencies]
-tokio = { version = "1.21", default-features = false, features = ["macros", "rt-multi-thread", "net", "signal", "sync"] }
+tokio = { version = "1.22", default-features = false, features = ["macros", "rt-multi-thread", "net", "signal", "sync"] }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 tracing-subscriber = { version = "0.3", features = ["tracing-log"] }
 tokio-tungstenite = { version = "0.17", default-features = false }