diff --git a/.drone.yml b/.drone.yml index bc9a5b1..7b9593f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,3 +31,17 @@ volumes: - name: dockersock host: path: /var/run/docker.sock + +--- + +kind: pipeline +name: tools +workspace: + base: /lewa + +steps: + - name: rust tests + image: "rust:1" + pull: always + commands: + - cd tools && cargo test diff --git a/book/default.nix b/book/default.nix index b4cd2c1..7aec7b3 100644 --- a/book/default.nix +++ b/book/default.nix @@ -34,7 +34,7 @@ let ''; }; in pkgs.dockerTools.buildLayeredImage { - name = "xena/lewa-book"; + name = "xena/lewa-book:${book.version}"; contents = [ book nur.repos.xe.quickserv ]; config.Cmd = [ "/bin/quickserv" "-port=9001" "-dir=/book" ]; } diff --git a/shell.nix b/shell.nix index e3244d2..f9dc141 100644 --- a/shell.nix +++ b/shell.nix @@ -9,13 +9,23 @@ let tex = pkgs.callPackage ./nix/texlive.nix { }; in pkgs.mkShell { buildInputs = with pkgs; [ + # deployment tools dyson - kindlegen kubectl kubectx + + # book tooks + kindlegen mdbook nur.repos.mic92.pandoc-bin tex + + # preview nur.repos.xe.zathura + + # rust + cargo + rustc + rls ]; } diff --git a/tools/.gitignore b/tools/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/tools/.gitignore @@ -0,0 +1 @@ +/target diff --git a/tools/Cargo.lock b/tools/Cargo.lock new file mode 100644 index 0000000..a43ace2 --- /dev/null +++ b/tools/Cargo.lock @@ -0,0 +1,5 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "lewa" +version = "0.1.0" diff --git a/tools/Cargo.toml b/tools/Cargo.toml new file mode 100644 index 0000000..8d23cdc --- /dev/null +++ b/tools/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "lewa" +version = "0.1.0" +authors = ["Christine Dodrill "] +edition = "2018" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] diff --git a/tools/src/lib.rs b/tools/src/lib.rs new file mode 100644 index 0000000..31e1bb2 --- /dev/null +++ b/tools/src/lib.rs @@ -0,0 +1,7 @@ +#[cfg(test)] +mod tests { + #[test] + fn it_works() { + assert_eq!(2 + 2, 4); + } +}