diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 71419aa..68f4bf0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -69,6 +69,8 @@ jobs: - name: Download binary artifacts id: download uses: actions/download-artifact@v4 + with: + merge-multiple: true - name: Debug artifact download run: ls -lh ${{ steps.download.outputs.download-path }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e7d9fb4..fd04e08 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,5 +21,5 @@ jobs: - name: Run unit tests in dev shell run: | - nix develop + nix develop .#test cargo test diff --git a/flake.nix b/flake.nix index 0cc7b81..bbec243 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ "x86_64-unknown-linux-musl" ]; in { - devShells = + devShells = let extraRustStds = system: targets: map (target: fenix.packages.${system}.targets.${target}.stable.rust-std) targets; toolchain = system: targets: @@ -30,7 +30,8 @@ eachSystem (system: { default = - with import nixpkgs { inherit system; }; mkShell { + with import nixpkgs { inherit system; }; + mkShell { nativeBuildInputs = [ (toolchain system crossTargets) yaml-language-server @@ -48,6 +49,12 @@ # CARGO_BUILD_RUSTFLAGS = [ "-C" "target-feature=+crt-static" ]; # TARGET_CC = "${CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER}"; }; + + test = + with import nixpkgs { inherit system; }; + mkShell { + nativeBuildInputs = [ fenix.packages.${system}.stable.minimalToolchain ]; + }; } );