ci: improve ci

Signed-off-by: Henry Gressmann <[email protected]>

Author: explodingcamera

.cargo/config.toml

@@ -1,5 +1,5 @@
 [target.aarch64-unknown-linux-musl]
-linker="aarch64-linux-gnu-gcc"
+linker="aarch64-linux-musl-gcc"
 
 [target.aarch64-unknown-linux-gnu]
 linker="aarch64-linux-gnu-gcc"

.github/workflows/build.yaml

@@ -15,41 +15,45 @@ env:
 
 jobs:
   build-notsd:
+    if: "${{contains((github.event.inputs.tag || github.ref_name), 'notsd-v')}}"
     name: Release ${{ github.event.inputs.tag || github.ref_name }} Docker image
     permissions:
       packages: write
       contents: write
-    if: "${{contains((github.event.inputs.tag || github.ref_name), 'notsd-v')}}"
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           ref: refs/tags/${{ env.RELEASE_TAG_REF }}
-      - name: Install latest stable Rust and add targets
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@v2
+      - name: Install aarch64 gcc
         run: |
           sudo apt-get update
-          sudo apt-get install -y gcc-x86-64-linux-gnu gcc-aarch64-linux-gnu musl-tools musl-dev liblmdb-dev
+          sudo apt-get install -y gcc-aarch64-linux-gnu
+      - name: Install latest stable Rust and add targets
+        run: |
           rustup toolchain install stable
           rustup default stable
-          rustup target add x86_64-unknown-linux-musl  
-          rustup target add aarch64-unknown-linux-musl
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+          rustup target add x86_64-unknown-linux-gnu
+          rustup target add aarch64-unknown-linux-gnu
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - uses: Swatinem/rust-cache@v2
       - name: Build binaries
         run: |
-          cargo build --release --target x86_64-unknown-linux-musl --locked --bin notsd
-          cargo build --release --target aarch64-unknown-linux-musl --locked --bin notsd
+          cargo build --release --target x86_64-unknown-linux-gnu --locked --bin notsd
+          cargo build --release --target aarch64-unknown-linux-gnu --locked --bin notsd
+
+          tar -czf target/x86_64-unknown-linux-gnu/release/notsd-x86_64-unknown-linux-gnu.tar.gz target/x86_64-unknown-linux-gnu/release/notsd
+          tar -czf target/aarch64-unknown-linux-gnu/release/notsd-aarch64-unknown-linux-gnu.tar.gz target/aarch64-unknown-linux-gnu/release/notsd
       - name: Upload binary to Release
         uses: softprops/action-gh-release@v1
         with:
           tag_name: ${{ env.RELEASE_TAG_REF }}
           files: |
-            target/x86_64-unknown-linux-musl/release/notsd-x86_64-unknown-linux.tar.gz
-            target/aarch64-unknown-linux-musl/release/notsd-aarch64-unknown-linux.tar.gz
+            target/x86_64-unknown-linux-gnu/release/notsd-x86_64-unknown-linux-gnu.tar.gz
+            target/aarch64-unknown-linux-gnu/release/notsd-aarch64-unknown-linux-gnu.tar.gz
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
@@ -60,8 +64,8 @@ jobs:
         id: out
         run: |
           mkdir -p /tmp/outputs
-          mv target/aarch64-unknown-linux-musl/release/notsd /tmp/outputs/notsd-arm64
-          mv target/x86_64-unknown-linux-musl/release/notsd /tmp/outputs/notsd-amd64
+          mv target/aarch64-unknown-linux-gnu/release/notsd /tmp/outputs/notsd-arm64
+          mv target/x86_64-unknown-linux-gnu/release/notsd /tmp/outputs/notsd-amd64
           version=$(echo ${{ env.RELEASE_TAG_REF }} | sed 's/notsd-v//')
           echo "version=$version" >> $GITHUB_OUTPUT
       - name: Build Docker image
@@ -138,11 +142,11 @@ jobs:
         run: |
           sudo apt-get install -y mingw-w64
 
-      - name: Install aarch64 gcc
+      - name: Install aarch64 musl
         if: ${{ matrix.platform.release_for == 'Linux-aarch64' }}
         run: |
-          sudo apt-get update
-          sudo apt-get install -y gcc-aarch64-linux-gnu
+          curl -s https://more.musl.cc/11/x86_64-linux-musl/aarch64-linux-musl-cross.tgz | tar -xz
+          echo "$PWD/aarch64-linux-musl-cross/bin" >> $GITHUB_PATH
 
       - name: Build binary
         run: cargo build --release --target ${{ matrix.platform.target }} --locked --bin nots-cli

.github/workflows/ci.yaml

@@ -4,7 +4,7 @@ on:
       - "**.rs"
       - "Cargo.lock"
 
-name: Build & Test
+name: Test all crates
 
 jobs:
   check:
@@ -13,18 +13,14 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
-
-      - name: Install latest stable Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          components: clippy, rustfmt
-          rustflags: ""
-
+        uses: actions/checkout@v4
+ 
       - uses: Swatinem/rust-cache@v2
 
-      - name: Build debug binaries
-        run: cargo build --all --locked
+      - name: Install latest stable Rust
+        run: |
+          rustup toolchain install stable
+          rustup default stable
 
       - name: Run cargo check
         run: cargo check --all --locked