Skip to content

Commit b8a7ecd

Browse files
authored
Merge pull request #97 from openebs/lvs-unload
fix: pull lvs unload fixes from spdk
2 parents c021369 + 97c0c07 commit b8a7ecd

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

.github/mergify.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ queue_rules:
33
update_method: rebase
44
branch_protection_injection_mode: merge
55
update_bot_account: openebs-ci
6+
merge_conditions:
7+
- check-success = code-lint
8+
- check-success = commitlint
9+
queue_conditions:
10+
- check-success = code-lint
11+
- check-success = commitlint
612
merge_queue:
713
max_parallel_checks: 1
814
pull_request_rules:

.github/workflows/code-lint.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,15 @@ jobs:
7979
nix_path: ${{ env.NIX_PATH }}
8080
- name: nix-shell
8181
run: nix-shell --pure -p nixpkgs-fmt --run "nixpkgs-fmt --check ."
82+
83+
code-lint:
84+
if: always()
85+
needs:
86+
- rust-lint
87+
- rust-dev
88+
- nix-lint
89+
runs-on: ubuntu-latest
90+
steps:
91+
- uses: re-actors/alls-green@release/v1
92+
with:
93+
jobs: ${{ toJSON(needs) }}

nix/pkgs/libspdk/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ let
9292
# Derivation attributes
9393
#
9494
spdk = rec {
95-
rev = "b78cde6f5cdd2f0f50810743d2865d7bee825ce4";
96-
sha256 = "sha256-GVWrKeYsKpro1XMYblky7ik6qw07aa/4CZqb9JU5cQU=";
95+
rev = "24775a47ebf16c066cea47e7da98bed2e4d1d798";
96+
sha256 = "sha256-4FkDgIgnuETHZSwmz0SzvKju71NcD6aCmJYnh9OuBsM=";
9797
pname = "libspdk${nameSuffix}";
9898
version = "25.05-${lib.substring 0 7 rev}";
9999
name = "${pname}-${version}";

0 commit comments

Comments
 (0)