Skip to content

Commit

Permalink
Merge pull request #168 from himmelblau-idm/dmulder/fix_ci
Browse files Browse the repository at this point in the history
Fix CI failures caused by cargo 1.80.1
  • Loading branch information
dmulder authored Sep 3, 2024
2 parents 894aa77 + 32eeaea commit e9a5e86
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "src/kanidm"]
path = src/kanidm
url = https://github.com/kanidm/kanidm.git
branch = master
url = https://github.com/dmulder/kanidm.git
branch = himmelblau/main
shallow = true
[submodule "src/idmap/sssd"]
path = src/idmap/sssd
Expand Down
3 changes: 3 additions & 0 deletions src/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ license.workspace = true
homepage.workspace = true
repository.workspace = true

[features]
tpm = ["kanidm-hsm-crypto/tpm"]

[lib]
name = "himmelblau_unix_common"
path = "src/lib.rs"
Expand Down
1 change: 1 addition & 0 deletions src/daemon/src/tasks_daemon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#![deny(clippy::await_holding_lock)]
#![deny(clippy::needless_pass_by_value)]
#![deny(clippy::trivially_copy_pass_by_ref)]
#![allow(unexpected_cfgs)]

use std::ffi::CString;
use std::os::unix::ffi::OsStrExt;
Expand Down
2 changes: 1 addition & 1 deletion src/kanidm
Submodule kanidm updated 1 files
+1 −0 libs/crypto/build.rs

0 comments on commit e9a5e86

Please sign in to comment.