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
6 changes: 6 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ queue_rules:
update_method: rebase
branch_protection_injection_mode: merge
update_bot_account: openebs-ci
merge_conditions:
- check-success = code-lint
- check-success = commitlint
queue_conditions:
- check-success = code-lint
- check-success = commitlint
merge_queue:
max_parallel_checks: 1
pull_request_rules:
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/code-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,15 @@ jobs:
nix_path: ${{ env.NIX_PATH }}
- name: nix-shell
run: nix-shell --pure -p nixpkgs-fmt --run "nixpkgs-fmt --check ."

code-lint:
if: always()
needs:
- rust-lint
- rust-dev
- nix-lint
runs-on: ubuntu-latest
steps:
- uses: re-actors/alls-green@release/v1
with:
jobs: ${{ toJSON(needs) }}
4 changes: 2 additions & 2 deletions nix/pkgs/libspdk/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ let
# Derivation attributes
#
spdk = rec {
rev = "b78cde6f5cdd2f0f50810743d2865d7bee825ce4";
sha256 = "sha256-GVWrKeYsKpro1XMYblky7ik6qw07aa/4CZqb9JU5cQU=";
rev = "24775a47ebf16c066cea47e7da98bed2e4d1d798";
sha256 = "sha256-4FkDgIgnuETHZSwmz0SzvKju71NcD6aCmJYnh9OuBsM=";
pname = "libspdk${nameSuffix}";
version = "25.05-${lib.substring 0 7 rev}";
name = "${pname}-${version}";
Expand Down