Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/code-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,10 @@ jobs:
- run: nix-build shell.nix --argstr spdk-path ./spdk
- run: nix-shell --argstr spdk-path spdk --run "./build_scripts/build_spdk.sh configure -t $(uname -m)-unknown-linux-gnu"
- run: nix-shell --argstr spdk-path spdk --run "./build_scripts/build_spdk.sh make"
- run: nix-shell --argstr spdk-path spdk --run "cargo build --all"
- run: nix-shell --argstr spdk-path spdk --run "cargo build --all --examples"
- run: sudo sysctl -w vm.nr_hugepages=512
- run: sudo -E ./target/debug/examples/hello_world
if: ${{ matrix.os != 'github-arm64-2c-8gb' }}
# - name: Setup tmate session
# if: ${{ failure() }}
# timeout-minutes: 120
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ repos:
name: Commit Lint
description: Runs commitlint against the commit message.
language: system
entry: bash -c 'nix-shell --pure --run "cat $1 | grep -v '^#' | commitlint"'
entry: bash -c 'nix-shell --pure --argstr spdk none --run "cat $1 | grep -v '^#' | commitlint"'
args: [$1]
stages: [commit-msg]
7 changes: 6 additions & 1 deletion nix/pkgs/libspdk/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@
, astyle
}:
let
nix-prefetch-github = pkgs.runCommand "nix-prefetch-github" { } ''
mkdir -p $out/bin
cp ${pkgs.nix-prefetch-github}/bin/nix-prefetch-github $out/bin/nix-prefetch-github
'';

# Suffix for debug build name.
nameSuffix = if build-type == "debug" then "-dev" else "";

Expand Down Expand Up @@ -113,7 +118,7 @@ let

sourceRoot = spdk.name;

devBuildInputs = [ astyle pkgs.python3Packages.tabulate pkgs.python3Packages.jinja2 pkgs.nix-prefetch-github ];
devBuildInputs = [ astyle pkgs.python3Packages.tabulate pkgs.python3Packages.jinja2 nix-prefetch-github ];

nativeBuildInputs = [
cmake
Expand Down