Skip to content

Commit

Permalink
chore: format; drop i686
Browse files Browse the repository at this point in the history
  • Loading branch information
vifino committed Jul 5, 2024
1 parent 9108f61 commit 055c56c
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,10 @@ jobs:
matrix:
# aarch64-linux and friends require emulation, which is terribly slow.
# so slow, that the test doesn't pass.
# i686 got dropped somewhere around 24.05
# TODO: set up aarch64 worker?
system: [x86_64, i686]
system: [x86_64]
check: [loop, tcp, rdma]
exclude:
# Failed to find module 'rdma_rxe'
- system: i686
check: rdma
name: ${{ matrix.system }} - ${{ matrix.check }}
steps:
- uses: actions/checkout@v4
Expand Down
3 changes: 2 additions & 1 deletion default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
rustPlatform.buildRustPackage {
pname = "nvmetcfg";
version = "0.1.0";
src = with lib.strings; builtins.filterSource
src = with lib.strings;
builtins.filterSource
(path: type: builtins.any (suf: hasPrefix (toString suf) path) [./src ./Cargo.toml ./Cargo.lock])
./.;

Expand Down
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
flake-utils.url = "github:numtide/flake-utils";
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs = {
nixpkgs.follows = "nixpkgs";
};
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = {
Expand All @@ -29,13 +27,16 @@
packages = rec {
nvmetcfg = pkgs.callPackage ./. {};
nvmetcfg-static = pkgs.pkgsStatic.callPackage ./. {};
nvmetcfg-coverage = (nvmetcfg.overrideAttrs (o: { RUSTFLAGS = "-C instrument-coverage"; dontStrip = true; }));
nvmetcfg-coverage = nvmetcfg.overrideAttrs (o: {
RUSTFLAGS = "-C instrument-coverage";
dontStrip = true;
});
default = nvmetcfg;
};
devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [
(rust-bin.stable.latest.default.override {
extensions = [ "llvm-tools-preview" ];
extensions = ["llvm-tools-preview"];
})
cargo-bloat
cargo-llvm-cov
Expand Down
3 changes: 2 additions & 1 deletion tests/loop.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
...
}: {
environment.systemPackages = with pkgs; [
self.packages.${system}.nvmetcfg-coverage nvme-cli
self.packages.${system}.nvmetcfg-coverage
nvme-cli
llvmPackages_17.bintools
];
boot.kernelModules = ["nvmet"];
Expand Down

0 comments on commit 055c56c

Please sign in to comment.