sqlite3 doesn't need to be installed on dev machines (#2104)

* Dependencies - sqlite3 dev no longer needs to be installed - Fixes #2083
* setting workspace-level features for rusqlite
This commit is contained in:
James Hodgkinson 2023-09-12 09:54:54 +10:00 committed by GitHub
parent b3aed1df34
commit d5c1f9de6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 12 additions and 14 deletions

View file

@ -31,7 +31,6 @@ jobs:
libpam0g-dev \ libpam0g-dev \
libudev-dev \ libudev-dev \
libssl-dev \ libssl-dev \
libsqlite3-dev \
pkg-config pkg-config
- name: "Run clippy (ignores errors, this is just a check)" - name: "Run clippy (ignores errors, this is just a check)"

View file

@ -30,9 +30,12 @@ jobs:
- name: Install deps - name: Install deps
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install -y clang build-essential \ sudo apt-get install -y \
librust-openssl-dev libssl-dev \ clang \
libsqlite3-dev libudev-dev \ build-essential \
librust-openssl-dev \
libssl-dev \
libudev-dev \
libpam0g-dev libpam0g-dev
- name: Setup mdBook - name: Setup mdBook
uses: peaceiris/actions-mdbook@v1 uses: peaceiris/actions-mdbook@v1

View file

@ -32,8 +32,7 @@ jobs:
sudo apt-get install -y \ sudo apt-get install -y \
libpam0g-dev \ libpam0g-dev \
libudev-dev \ libudev-dev \
libssl-dev \ libssl-dev
libsqlite3-dev
- name: "Build the workspace" - name: "Build the workspace"
run: cargo build --workspace run: cargo build --workspace

View file

@ -159,7 +159,7 @@ reqwest = { version = "0.11.20", default-features = false, features = [
"native-tls-alpn", "native-tls-alpn",
] } ] }
rpassword = "^7.2.0" rpassword = "^7.2.0"
rusqlite = "^0.28.0" rusqlite = { version = "^0.28.0", features = ["array", "bundled"] }
scim_proto = "^0.2.1" scim_proto = "^0.2.1"
sd-notify = "^0.4.1" sd-notify = "^0.4.1"

View file

@ -81,7 +81,7 @@ You need [rustup](https://rustup.rs/) to install a Rust toolchain.
You will also need some system libraries to build this, which can be installed by running: You will also need some system libraries to build this, which can be installed by running:
```bash ```bash
sudo apt-get install libsqlite3-dev libudev-dev libssl-dev pkg-config libpam0g-dev sudo apt-get install libudev-dev libssl-dev pkg-config libpam0g-dev
``` ```
Tested with Ubuntu 20.04 and 22.04. Tested with Ubuntu 20.04 and 22.04.

View file

@ -15,7 +15,6 @@ apt-get install -y \
libpam0g-dev \ libpam0g-dev \
libudev-dev \ libudev-dev \
libssl-dev \ libssl-dev \
libsqlite3-dev \
pkg-config \ pkg-config \
make \ make \
devscripts \ devscripts \
@ -27,7 +26,6 @@ else
libpam0g-dev \ libpam0g-dev \
libudev-dev \ libudev-dev \
libssl-dev \ libssl-dev \
libsqlite3-dev \
pkg-config \ pkg-config \
make \ make \
devscripts \ devscripts \

View file

@ -2,7 +2,7 @@ Source: kanidm-unixd
Section: admin Section: admin
Priority: optional Priority: optional
Maintainer: James Hodgkinson <james@terminaloutcomes.com> Maintainer: James Hodgkinson <james@terminaloutcomes.com>
Build-Depends: debhelper (>=10), libpam0g-dev, libudev-dev, libssl-dev, libsqlite3-dev, pkg-config, cargo, make Build-Depends: debhelper (>=10), libpam0g-dev, libudev-dev, libssl-dev, pkg-config, cargo, make
Standards-Version: 4.6.0 Standards-Version: 4.6.0
Homepage: https://kanidm.com Homepage: https://kanidm.com
Vcs-Git: https://github.com/kanidm/kanidm/ Vcs-Git: https://github.com/kanidm/kanidm/

View file

@ -2,7 +2,7 @@ Source: kanidm
Section: admin Section: admin
Priority: optional Priority: optional
Maintainer: James Hodgkinson <james@terminaloutcomes.com> Maintainer: James Hodgkinson <james@terminaloutcomes.com>
Build-Depends: debhelper (>=10), libpam0g-dev, libudev-dev, libssl-dev, libsqlite3-dev, pkg-config, cargo, make Build-Depends: debhelper (>=10), libpam0g-dev, libudev-dev, libssl-dev, pkg-config, cargo, make
Standards-Version: 4.6.0 Standards-Version: 4.6.0
Homepage: https://kanidm.com Homepage: https://kanidm.com
Vcs-Git: https://github.com/kanidm/kanidm/ Vcs-Git: https://github.com/kanidm/kanidm/

View file

@ -2,7 +2,7 @@ Source: kanidmd
Section: admin Section: admin
Priority: optional Priority: optional
Maintainer: James Hodgkinson <james@terminaloutcomes.com> Maintainer: James Hodgkinson <james@terminaloutcomes.com>
Build-Depends: debhelper (>=10), libpam0g-dev, libudev-dev, libssl-dev, libsqlite3-dev, pkg-config, cargo, make Build-Depends: debhelper (>=10), libpam0g-dev, libudev-dev, libssl-dev, pkg-config, cargo, make
Standards-Version: 4.6.0 Standards-Version: 4.6.0
Homepage: https://kanidm.com Homepage: https://kanidm.com
Vcs-Git: https://github.com/kanidm/kanidm/ Vcs-Git: https://github.com/kanidm/kanidm/

View file

@ -13,7 +13,6 @@ ${SUDOCMD} apt-get install -y \
libpam0g-dev \ libpam0g-dev \
libudev-dev \ libudev-dev \
libssl-dev \ libssl-dev \
libsqlite3-dev \
pkg-config \ pkg-config \
curl \ curl \
rsync \ rsync \