Merge branch 'main' into flow

.github/workflows/release.yml

@@ -18,105 +18,175 @@ env:
   CARGO_TERM_COLOR: always
   BINARY_NAME: telemt
 
+# ==========================
+# GNU / glibc
+# ==========================
 jobs:
-  build:
+  build-gnu:
-    name: Build ${{ matrix.target }}
+    name: GNU ${{ matrix.target }}
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
         include:
-          # ===== GNU / glibc =====
           - target: x86_64-unknown-linux-gnu
-            asset_name: telemt-x86_64-linux-gnu
+            asset: telemt-x86_64-linux-gnu
           - target: aarch64-unknown-linux-gnu
-            asset_name: telemt-aarch64-linux-gnu
+            asset: telemt-aarch64-linux-gnu
-
-          # ===== MUSL =====
-          - target: x86_64-unknown-linux-musl
-            asset_name: telemt-x86_64-linux-musl
 
     steps:
       - uses: actions/checkout@v4
 
-      # ---------- Toolchain ----------
       - uses: dtolnay/rust-toolchain@v1
         with:
           toolchain: stable
           targets: |
             x86_64-unknown-linux-gnu
             aarch64-unknown-linux-gnu
-            x86_64-unknown-linux-musl
 
-      # ---------- System deps (bookworm) ----------
+      - name: Install deps
-      - name: Install build deps
         run: |
           sudo apt-get update
-          sudo apt-get install -y --no-install-recommends \
+          sudo apt-get install -y \
             build-essential \
             clang \
             lld \
             pkg-config \
-            musl-tools \
             gcc-aarch64-linux-gnu \
-            g++-aarch64-linux-gnu \
+            g++-aarch64-linux-gnu
-            ca-certificates
 
-      # ---------- Cache ----------
       - uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
             target
-          key: ${{ runner.os }}-${{ matrix.target }}-${{ hashFiles('**/Cargo.lock') }}
+          key: gnu-${{ matrix.target }}-${{ hashFiles('**/Cargo.lock') }}
 
-      # ---------- Build ----------
       - name: Build
-        env:
-          CC_x86_64_unknown_linux_gnu: clang
-          CXX_x86_64_unknown_linux_gnu: clang++
-
-          CC_aarch64_unknown_linux_gnu: aarch64-linux-gnu-gcc
-          CXX_aarch64_unknown_linux_gnu: aarch64-linux-gnu-g++
-
-          CC_x86_64_unknown_linux_musl: musl-gcc
-
-          RUSTFLAGS: "-C linker=clang -C link-arg=-fuse-ld=lld"
         run: |
-          case "${{ matrix.target }}" in
+          if [[ "${{ matrix.target }}" == "aarch64-unknown-linux-gnu" ]]; then
-            x86_64-unknown-linux-musl)
+            export CC=aarch64-linux-gnu-gcc
-              export RUSTFLAGS="-C target-feature=+crt-static"
+            export CXX=aarch64-linux-gnu-g++
-              ;;
+            export CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc
-          esac
+            export CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++
+            export RUSTFLAGS="-C linker=aarch64-linux-gnu-gcc"
+          else
+            export CC=clang
+            export CXX=clang++
+            export CC_x86_64_unknown_linux_gnu=clang
+            export CXX_x86_64_unknown_linux_gnu=clang++
+            export RUSTFLAGS="-C linker=clang -C link-arg=-fuse-ld=lld"
+          fi
 
           cargo build --release --target ${{ matrix.target }}
 
-      # ---------- Package ----------
       - name: Package
         run: |
           mkdir -p dist
-
           BIN=target/${{ matrix.target }}/release/${{ env.BINARY_NAME }}
 
           cp "$BIN" dist/${{ env.BINARY_NAME }}-${{ matrix.target }}
 
           cd dist
-          tar -czf ${{ matrix.asset_name }}.tar.gz ${{ env.BINARY_NAME }}-${{ matrix.target }}
+          tar -czf ${{ matrix.asset }}.tar.gz ${{ env.BINARY_NAME }}-${{ matrix.target }}
-          sha256sum ${{ matrix.asset_name }}.tar.gz > ${{ matrix.asset_name }}.sha256
+          sha256sum ${{ matrix.asset }}.tar.gz > ${{ matrix.asset }}.sha256
 
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.asset_name }}
+          name: ${{ matrix.asset }}
           path: |
-            dist/${{ matrix.asset_name }}.tar.gz
+            dist/${{ matrix.asset }}.tar.gz
-            dist/${{ matrix.asset_name }}.sha256
+            dist/${{ matrix.asset }}.sha256
 
+# ==========================
+# MUSL (isolated environment)
+# ==========================
+  build-musl:
+    name: MUSL ${{ matrix.target }}
+    runs-on: ubuntu-latest
+
+    container:
+      image: rust:1.75-slim-bookworm
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - target: x86_64-unknown-linux-musl
+            asset: telemt-x86_64-linux-musl
+          - target: aarch64-unknown-linux-musl
+            asset: telemt-aarch64-linux-musl
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install deps (musl env)
+        run: |
+          apt-get update
+          apt-get install -y \
+            musl-tools \
+            pkg-config \
+            curl
+
+      - name: Install aarch64 musl toolchain
+        if: matrix.target == 'aarch64-unknown-linux-musl'
+        run: |
+          curl -LO https://musl.cc/aarch64-linux-musl-cross.tgz
+          tar -xzf aarch64-linux-musl-cross.tgz
+          echo "$PWD/aarch64-linux-musl-cross/bin" >> $GITHUB_PATH
+
+      - name: Add rust target
+        run: rustup target add ${{ matrix.target }}
+
+      - uses: actions/cache@v4
+        with:
+          path: |
+            /usr/local/cargo/registry
+            /usr/local/cargo/git
+            target
+          key: musl-${{ matrix.target }}-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Build
+        run: |
+          if [[ "${{ matrix.target }}" == "aarch64-unknown-linux-musl" ]]; then
+            export CC=aarch64-linux-musl-gcc
+            export CC_aarch64_unknown_linux_musl=aarch64-linux-musl-gcc
+            export RUSTFLAGS="-C target-feature=+crt-static -C linker=aarch64-linux-musl-gcc"
+          else
+            export CC=musl-gcc
+            export CC_x86_64_unknown_linux_musl=musl-gcc
+            export RUSTFLAGS="-C target-feature=+crt-static"
+          fi
+
+          cargo build --release --target ${{ matrix.target }}
+
+      - name: Package
+        run: |
+          mkdir -p dist
+          BIN=target/${{ matrix.target }}/release/${{ env.BINARY_NAME }}
+
+          cp "$BIN" dist/${{ env.BINARY_NAME }}-${{ matrix.target }}
+
+          cd dist
+          tar -czf ${{ matrix.asset }}.tar.gz ${{ env.BINARY_NAME }}-${{ matrix.target }}
+          sha256sum ${{ matrix.asset }}.tar.gz > ${{ matrix.asset }}.sha256
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.asset }}
+          path: |
+            dist/${{ matrix.asset }}.tar.gz
+            dist/${{ matrix.asset }}.sha256
+
+# ==========================
+# Docker
+# ==========================
   docker:
     name: Docker
     runs-on: ubuntu-latest
-    needs: build
+    needs: [build-gnu, build-musl]
     continue-on-error: true
 
     steps:
@@ -147,11 +217,10 @@ jobs:
         id: vars
         run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
 
-      - name: Build & Push prod
+      - name: Build & Push
         uses: docker/build-push-action@v6
         with:
           context: .
-          target: prod
           push: true
           platforms: linux/amd64,linux/arm64
           tags: |
@@ -160,10 +229,13 @@ jobs:
           build-args: |
             BINARY=dist/telemt
 
+# ==========================
+# Release
+# ==========================
   release:
     name: Release
     runs-on: ubuntu-latest
-    needs: build
+    needs: [build-gnu, build-musl]
 
     permissions:
       contents: write