Merge pull request #20 from babichjacob/release-plz-2024-10-07T20-24-50Z

chore: release

.github/workflows/check-and-build-and-test.yml

@@ -18,23 +18,35 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  formatting-and-deny:
+  audit-and-deny-and-clippy-and-formatting:
-    name: Check formatting and cargo-deny
+    name: Check cargo-audit, cargo-deny, clippy, and formatting
     runs-on: ubuntu-latest
-    timeout-minutes: 2
+    timeout-minutes: 4
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
       - name: Install stable Rust toolchain
         uses: dtolnay/rust-toolchain@stable
+      - name: Install cargo-audit
+        uses: taiki-e/install-action@cargo-audit
 
-      - name: Formatting
+      - uses: Swatinem/rust-cache@v2
-        run: cargo fmt --check --verbose
+
+      - name: cargo-audit
+        run: cargo-audit audit --deny warnings
 
       - name: cargo-deny
         uses: EmbarkStudios/cargo-deny-action@v2
 
+      - name: Clippy
+        run: cargo clippy
+        env:
+          RUSTFLAGS: "--deny warnings"
+
+      - name: Formatting
+        run: cargo fmt --check --verbose
+
   check-and-build:
     strategy:
       matrix:
@@ -88,7 +100,7 @@ jobs:
             target: x86_64-pc-windows-msvc
     name: Check and build ${{ matrix.supporteds.target }} (on ${{ matrix.supporteds.runner }}) ${{ matrix.minimal_or_latest.job_name_suffix }}
     runs-on: ${{ matrix.supporteds.runner }}
-    timeout-minutes: 5
+    timeout-minutes: 8
     env:
       # https://github.com/rust-lang/stacker/issues/80#issuecomment-1547991131
       CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
@@ -165,7 +177,7 @@ jobs:
             target: x86_64-pc-windows-msvc
     name: Test ${{ matrix.supporteds.target }} (on ${{ matrix.supporteds.runner }})
     runs-on: ${{ matrix.supporteds.runner }}
-    timeout-minutes: 5
+    timeout-minutes: 8
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -193,26 +205,26 @@ jobs:
   msrv:
     strategy:
       matrix:
-        crate_directory:
-          - ./core
-          - ./cli-clap
-          - ./gui-eframe
-          - ./tui-ratatui
-          - ./multibinary
-
         supporteds:
           - runner: macos-latest
             target: aarch64-apple-darwin
 
+          - runner: macos-latest
+            target: x86_64-apple-darwin
+
           - runner: ubuntu-latest
             target: x86_64-unknown-linux-gnu
 
+          - install_prerequisite: sudo apt-get update && sudo apt-get install musl-dev musl-tools && sudo ln -s /bin/g++ /bin/musl-g++
+            runner: ubuntu-latest
+            target: x86_64-unknown-linux-musl
+
           - prerequisite_step: rm ~/.cargo/bin/cargo.exe; rm ~/.cargo/bin/rust-analyzer.exe; rm ~/.cargo/bin/rustfmt.exe; rustup update
             runner: windows-latest
             target: x86_64-pc-windows-msvc
-    name: Verify MSRV of ${{ matrix.crate_directory }} for ${{ matrix.supporteds.target }} (on ${{ matrix.supporteds.runner }})
+    name: Verify MSRV for ${{ matrix.supporteds.target }} (on ${{ matrix.supporteds.runner }})
     runs-on: ${{ matrix.supporteds.runner }}
-    timeout-minutes: 4
+    timeout-minutes: 8
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -231,6 +243,18 @@ jobs:
         with:
           tool: cargo-msrv
 
-      - name: Verify declared MSRV (minimum supported Rust version)
+      - name: Verify core's declared MSRV (minimum supported Rust version)
         run: cargo-msrv verify --output-format json
-        working-directory: ${{ matrix.crate_directory }}
+        working-directory: ./core
+      - name: Verify cli-clap's declared MSRV (minimum supported Rust version)
+        run: cargo-msrv verify --output-format json
+        working-directory: ./cli-clap
+      - name: Verify gui-eframe's declared MSRV (minimum supported Rust version)
+        run: cargo-msrv verify --output-format json
+        working-directory: ./gui-eframe
+      - name: Verify tui-ratatui's declared MSRV (minimum supported Rust version)
+        run: cargo-msrv verify --output-format json
+        working-directory: ./tui-ratatui
+      - name: Verify multibinary's declared MSRV (minimum supported Rust version)
+        run: cargo-msrv verify --output-format json
+        working-directory: ./multibinary

.github/workflows/daily.yml

@@ -0,0 +1,157 @@
+name: Daily
+
+on:
+  schedule:
+    - cron: "41 23 * * *"
+
+jobs:
+  audit:
+    name: Use `cargo-audit` to create issues for vulnerabilities or other problems
+    runs-on: ubuntu-latest
+    timeout-minutes: 4
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - uses: rustsec/audit-check@v2.0.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+  check-and-build-with-nightly:
+    strategy:
+      matrix:
+        supporteds:
+          - runner: macos-latest
+            target: aarch64-apple-darwin
+
+          - runner: macos-latest
+            target: x86_64-apple-darwin
+
+          - install_prerequisite: sudo apt-get update && sudo apt-get install musl-dev musl-tools gcc-aarch64-linux-gnu g++-aarch64-linux-gnu && sudo ln -s /bin/g++ /bin/musl-g++
+            runner: ubuntu-latest
+            target: aarch64-unknown-linux-gnu
+
+          - install_prerequisite: sudo apt-get update && sudo apt-get install musl-dev musl-tools gcc-aarch64-linux-gnu g++-aarch64-linux-gnu && sudo ln -s /bin/g++ /bin/musl-g++
+            runner: ubuntu-latest
+            target: aarch64-unknown-linux-musl
+
+          - runner: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+
+          - install_prerequisite: sudo apt-get update && sudo apt-get install musl-dev musl-tools && sudo ln -s /bin/g++ /bin/musl-g++
+            runner: ubuntu-latest
+            target: x86_64-unknown-linux-musl
+
+          # I would like to support this but I don't know how to install the dependencies to be able to
+          # - runner: windows-latest
+          #   target: aarch64-pc-windows-gnullvm
+
+          - runner: windows-latest
+            target: aarch64-pc-windows-msvc
+
+          # I don't think supporting this is up to me
+          # I forgot where I learned this, but
+          # I don't think I can use a non-Rust dependency (i.e. llama.cpp) here
+          # - runner: windows-latest
+          #   target: x86_64-pc-windows-gnu
+
+          - runner: windows-latest
+            target: x86_64-pc-windows-msvc
+    name: Check and build ${{ matrix.supporteds.target }} with nightly Rust (on ${{ matrix.supporteds.runner }}) ${{ matrix.minimal_or_latest.job_name_suffix }}
+    runs-on: ${{ matrix.supporteds.runner }}
+    timeout-minutes: 8
+    env:
+      # https://github.com/rust-lang/stacker/issues/80#issuecomment-1547991131
+      CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
+      CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER: aarch64-linux-gnu-gcc # TODO: shouldn't this be something to do with musl, not gcc?
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install prerequisite build chain
+        if: matrix.supporteds.install_prerequisite
+        run: ${{ matrix.supporteds.install_prerequisite }}
+
+      - name: Install nightly Rust toolchain
+        uses: dtolnay/rust-toolchain@nightly
+        with:
+          targets: ${{ matrix.supporteds.target }}
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: ${{ matrix.supporteds.target }}-latest-nightly
+          cache-on-failure: "true"
+
+      - name: Check
+        run: cargo check --verbose
+
+      - name: Build
+        run: cargo build --verbose
+
+  test-with-nightly:
+    strategy:
+      matrix:
+        supporteds:
+          - runner: macos-latest
+            target: aarch64-apple-darwin
+
+          - runner: macos-latest
+            target: x86_64-apple-darwin
+
+          # Not able to be tested in GitHub Actions (without emulation, at least)
+          # - runner: ubuntu-latest
+          #   target: aarch64-unknown-linux-gnu
+
+          # Not able to be tested in GitHub Actions (without emulation, at least)
+          # - runner: ubuntu-latest
+          #   target: aarch64-unknown-linux-musl
+
+          - runner: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+
+          - install_prerequisite: sudo apt-get update && sudo apt-get install musl-dev musl-tools && sudo ln -s /bin/g++ /bin/musl-g++
+            runner: ubuntu-latest
+            target: x86_64-unknown-linux-musl
+
+          # Not able to be tested in GitHub Actions (without emulation, at least)
+          # - runner: windows-latest
+          #   target: aarch64-pc-windows-gnullvm
+
+          # Not able to be tested in GitHub Actions (without emulation, at least)
+          # - runner: windows-latest
+          #   target: aarch64-pc-windows-msvc
+
+          # I don't think supporting this is up to me
+          # I forgot where I learned this, but
+          # I don't think I can use a non-Rust dependency (i.e. llama.cpp) here
+          # - runner: windows-latest
+          #   target: x86_64-pc-windows-gnu
+
+          - runner: windows-latest
+            target: x86_64-pc-windows-msvc
+    name: Test ${{ matrix.supporteds.target }} with nightly Rust (on ${{ matrix.supporteds.runner }})
+    runs-on: ${{ matrix.supporteds.runner }}
+    timeout-minutes: 8
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install prerequisite build chain
+        if: matrix.supporteds.install_prerequisite
+        run: ${{ matrix.supporteds.install_prerequisite }}
+
+      - name: Install nightly Rust toolchain
+        uses: dtolnay/rust-toolchain@nightly
+        with:
+          targets: ${{ matrix.supporteds.target }}
+
+      - name: Install Nextest
+        uses: taiki-e/install-action@cargo-nextest
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: ${{ matrix.supporteds.target }}-latest-nightly
+          cache-on-failure: "true"
+
+      - name: Test
+        run: cargo nextest run --target ${{ matrix.supporteds.target }}

Cargo.lock

@@ -4,7 +4,7 @@ version = 3
 
 [[package]]
 name = "ac-qu-ai-nt"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "ac-qu-ai-nt-cli-clap",
  "ac-qu-ai-nt-gui-eframe",
@@ -16,7 +16,7 @@ dependencies = [
 
 [[package]]
 name = "ac-qu-ai-nt-cli-clap"
-version = "0.0.8"
+version = "0.0.9"
 dependencies = [
  "clap",
  "tracing",
@@ -24,7 +24,7 @@ dependencies = [
 
 [[package]]
 name = "ac-qu-ai-nt-core"
-version = "0.0.3"
+version = "0.0.4"
 dependencies = [
  "llama-cpp-2",
  "snafu",
@@ -33,14 +33,14 @@ dependencies = [
 
 [[package]]
 name = "ac-qu-ai-nt-gui-eframe"
-version = "0.0.5"
+version = "0.0.6"
 dependencies = [
  "tracing",
 ]
 
 [[package]]
 name = "ac-qu-ai-nt-tui-ratatui"
-version = "0.0.5"
+version = "0.0.6"
 dependencies = [
  "tracing",
 ]
@@ -134,9 +134,9 @@ checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "cc"
-version = "1.1.28"
+version = "1.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1"
+checksum = "58e804ac3194a48bb129643eb1d62fcc20d18c6b8c181704489353d13120bcd1"
 dependencies = [
  "jobserver",
  "libc",
@@ -384,7 +384,8 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 [[package]]
 name = "llama-cpp-2"
 version = "0.1.82"
-source = "git+https://github.com/babichjacob/llama-cpp-rs?branch=fix-use-c-char-instead-of-i8#92bef3a7d2dbd49af9e22cf44a30b33bb0af9202"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e40528912f1212003f65912c0ad1d2d2d0302e53557e0ea3cd12b5706a9223ca"
 dependencies = [
  "enumflags2",
  "llama-cpp-sys-2",
@@ -395,7 +396,8 @@ dependencies = [
 [[package]]
 name = "llama-cpp-sys-2"
 version = "0.1.82"
-source = "git+https://github.com/babichjacob/llama-cpp-rs?branch=fix-use-c-char-instead-of-i8#92bef3a7d2dbd49af9e22cf44a30b33bb0af9202"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccfde3214b7b8bcc25448198df1add0630695c7a2773a60400572bf5156b9335"
 dependencies = [
  "bindgen",
  "cc",

Cargo.toml

@@ -11,6 +11,3 @@ repository = "https://github.com/babichjacob/ac-qu-ai-nt"
 clap = "4"
 snafu = "0.8"
 tracing = "0.1.23"
-
-[patch.crates-io]
-llama-cpp-2 = { version = "0.1.81", git = "https://github.com/babichjacob/llama-cpp-rs", branch = "fix-use-c-char-instead-of-i8" }

cli-clap/CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.9](https://github.com/babichjacob/ac-qu-ai-nt/compare/ac-qu-ai-nt-cli-clap-v0.0.8...ac-qu-ai-nt-cli-clap-v0.0.9) - 2024-10-15
+
+### Fixed
+
+- *(ac-qu-ai-nt-cli-clap)* write a `main` function instead of re-exporting so that the declared MSRV can be met
+
+### Other
+
+- *(cli-clap)* ignore the `Args` argument because it doesn't get used yet (to satisfy Clippy)
+- build out the infrastructure for commands to be passed to the clap CLI
+
 ## [0.0.8](https://github.com/babichjacob/ac-qu-ai-nt/compare/ac-qu-ai-nt-cli-clap-v0.0.7...ac-qu-ai-nt-cli-clap-v0.0.8) - 2024-10-07
 
 ### Other

cli-clap/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ac-qu-ai-nt-cli-clap"
 description = "A CLI (written with clap) for ac-qu-ai-nt"
-version = "0.0.8"
+version = "0.0.9"
 edition = "2021"
 rust-version = "1.76"
 

cli-clap/src/lib.rs

@@ -1,4 +1,15 @@
-pub fn main() {
+use clap::{Parser, Subcommand};
+
+#[derive(Debug, Subcommand)]
+enum Command {}
+
+#[derive(Debug, Parser)]
+pub struct Args {
+    #[command(subcommand)]
+    command: Command,
+}
+
+pub fn main(_args: Args) {
     #[cfg(feature = "tracing")]
     tracing::info!("What's up, world?");
 }

cli-clap/src/main.rs

@@ -1,3 +1,7 @@
+use clap::Parser;
+
 fn main() {
-    ac_qu_ai_nt_cli_clap::main();
+    let args = ac_qu_ai_nt_cli_clap::Args::parse();
+
+    ac_qu_ai_nt_cli_clap::main(args);
 }

core/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.4](https://github.com/babichjacob/ac-qu-ai-nt/compare/ac-qu-ai-nt-core-v0.0.3...ac-qu-ai-nt-core-v0.0.4) - 2024-10-15
+
+### Other
+
+- update `llama-cpp-2` and other packages
+- *(ac-qu-ai-nt-core)* update `llama-cpp-2`
+- *(core)* add `snafu` as a dependency
+
 ## [0.0.3](https://github.com/babichjacob/ac-qu-ai-nt/compare/ac-qu-ai-nt-core-v0.0.2...ac-qu-ai-nt-core-v0.0.3) - 2024-10-07
 
 ### Other

core/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ac-qu-ai-nt-core"
 description = "The core library of ac-qu-ai-nt. If you're looking for the application, see cli-clap or gui-eframe or tui-ratatui or the multibinary"
-version = "0.0.3"
+version = "0.0.4"
 edition = "2021"
 rust-version = "1.76"
 
@@ -14,7 +14,7 @@ default = ["tracing"]
 tracing = ["dep:tracing"]
 
 [dependencies]
-llama-cpp-2 = "0.1.81"
+llama-cpp-2 = "0.1.82"
 snafu = { workspace = true }
 
 tracing = { workspace = true, optional = true }

gui-eframe/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.6](https://github.com/babichjacob/ac-qu-ai-nt/compare/ac-qu-ai-nt-gui-eframe-v0.0.5...ac-qu-ai-nt-gui-eframe-v0.0.6) - 2024-10-15
+
+### Fixed
+
+- *(ac-qu-ai-nt-gui-eframe)* write a `main` function instead of re-exporting so that the declared MSRV can be met
+
 ## [0.0.5](https://github.com/babichjacob/ac-qu-ai-nt/compare/ac-qu-ai-nt-gui-eframe-v0.0.4...ac-qu-ai-nt-gui-eframe-v0.0.5) - 2024-10-07
 
 ### Other

gui-eframe/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ac-qu-ai-nt-gui-eframe"
 description = "A GUI (written with egui / eframe) for ac-qu-ai-nt"
-version = "0.0.5"
+version = "0.0.6"
 edition = "2021"
 rust-version = "1.76"
 

multibinary/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.13](https://github.com/babichjacob/ac-qu-ai-nt/compare/ac-qu-ai-nt-v0.0.12...ac-qu-ai-nt-v0.0.13) - 2024-10-15
+
+### Other
+
+- build out the infrastructure for commands to be passed to the clap CLI
+
 ## [0.0.12](https://github.com/babichjacob/ac-qu-ai-nt/compare/ac-qu-ai-nt-v0.0.11...ac-qu-ai-nt-v0.0.12) - 2024-10-07
 
 ### Other

multibinary/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ac-qu-ai-nt"
 description = "A WIP project using AI to break down a user's query, acquire the knowledge to answer it, then transfer those insights to the user"
-version = "0.0.12"
+version = "0.0.13"
 edition = "2021"
 rust-version = "1.76"
 
@@ -27,9 +27,9 @@ tracing = [
 ]
 
 [dependencies]
-ac-qu-ai-nt-cli-clap = { version = "0.0.8", path = "../cli-clap", optional = true }
+ac-qu-ai-nt-cli-clap = { version = "0.0.9", path = "../cli-clap", optional = true }
-ac-qu-ai-nt-gui-eframe = { version = "0.0.5", path = "../gui-eframe", optional = true }
+ac-qu-ai-nt-gui-eframe = { version = "0.0.6", path = "../gui-eframe", optional = true }
-ac-qu-ai-nt-tui-ratatui = { version = "0.0.5", path = "../tui-ratatui", optional = true }
+ac-qu-ai-nt-tui-ratatui = { version = "0.0.6", path = "../tui-ratatui", optional = true }
 
 clap = { workspace = true, features = ["derive", "env"] }
 dirs-next = "2.0.0"

multibinary/src/main.rs

@@ -19,7 +19,7 @@ struct Args {
 enum Command {
     #[cfg(feature = "cli-clap")]
     #[command(alias = "cli")]
-    CliClap,
+    CliClap(ac_qu_ai_nt_cli_clap::Args),
     #[cfg(feature = "gui-eframe")]
     #[command(alias = "gui")]
     GuiEframe,
@@ -57,7 +57,7 @@ fn main() {
 
     match command {
         #[cfg(feature = "cli-clap")]
-        Command::CliClap => ac_qu_ai_nt_cli_clap::main(),
+        Command::CliClap(args) => ac_qu_ai_nt_cli_clap::main(args),
         #[cfg(feature = "gui-eframe")]
         Command::GuiEframe => ac_qu_ai_nt_gui_eframe::main(),
         #[cfg(feature = "tui-ratatui")]

tui-ratatui/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.6](https://github.com/babichjacob/ac-qu-ai-nt/compare/ac-qu-ai-nt-tui-ratatui-v0.0.5...ac-qu-ai-nt-tui-ratatui-v0.0.6) - 2024-10-15
+
+### Fixed
+
+- *(ac-qu-ai-nt-tui-ratatui)* write a `main` function instead of re-exporting so that the declared MSRV can be met
+
 ## [0.0.5](https://github.com/babichjacob/ac-qu-ai-nt/compare/ac-qu-ai-nt-tui-ratatui-v0.0.4...ac-qu-ai-nt-tui-ratatui-v0.0.5) - 2024-10-07
 
 ### Other

tui-ratatui/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ac-qu-ai-nt-tui-ratatui"
 description = "A TUI (written with Ratatui) for ac-qu-ai-nt"
-version = "0.0.5"
+version = "0.0.6"
 edition = "2021"
 rust-version = "1.76"