Skip to content

Commit

Permalink
Merge branch 'local-ai' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
lucksus committed Oct 24, 2024
2 parents d3a8a68 + fbd95e0 commit 133ad04
Show file tree
Hide file tree
Showing 74 changed files with 23,326 additions and 12,686 deletions.
4 changes: 2 additions & 2 deletions .circleci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ RUN echo 'export PATH="/usr/local/bin:$PATH"' >> $HOME/.bashrc
# Install Rust
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
RUN echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> /home/circleci/.bashrc
RUN ~/.cargo/bin/rustup install 1.78
RUN ~/.cargo/bin/rustup default 1.78
RUN ~/.cargo/bin/rustup install 1.80
RUN ~/.cargo/bin/rustup default 1.80
RUN ~/.cargo/bin/rustup target add wasm32-unknown-unknown

# Install Deno
Expand Down
6 changes: 5 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ orbs:
jobs:
build-and-test:
docker:
- image: coasys/ad4m-ci-linux:latest@sha256:1278f700839a43daa0edd31b605c4a73e7f5c54c0d8c7dfbc26b3aa4e2e4ef66
- image: coasys/ad4m-ci-linux:latest@sha256:989a070068192050e61f2fab134f598739b0ec6756588fada602709081b28152
resource_class: xlarge
steps:
- checkout
Expand Down Expand Up @@ -52,6 +52,9 @@ jobs:
- run:
name: cargo fmt --check
command: cargo fmt --check
- run:
name: install gobjc
command: sudo apt-get install gobjc clang gnustep-devel libobjc4 libgnustep-base-dev libasound2-dev pkg-config fuse libfuse2 mesa-utils mesa-vulkan-drivers
- run:
name: Install dependencies
command: pnpm install --no-frozen-lockfile
Expand All @@ -78,6 +81,7 @@ jobs:
- ./target/release/ad4m-executor
- run:
name: cargo clippy
no_output_timeout: 30m
command: cargo clippy --all --exclude ad4m-launcher
- run:
name: Remove pnpm patches
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
if: matrix.platform == 'GH-hosted-ubuntu'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf protobuf-compiler cmake
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf protobuf-compiler cmake fuse libfuse2 mesa-vulkan-drivers
- name: install dependencies (macos only)
if: matrix.platform == 'macos-latest'
Expand Down Expand Up @@ -356,7 +356,7 @@ jobs:
- name: Install Linux Deps
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf protobuf-compiler cmake
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf protobuf-compiler cmake fuse libfuse2 mesa-vulkan-drivers
- name: Build modules
run: pnpm run build-libs
Expand Down Expand Up @@ -438,7 +438,7 @@ jobs:
- name: Install Linux Deps
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf protobuf-compiler cmake
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf protobuf-compiler cmake fuse libfuse2 mesa-utils mesa-vulkan-drivers
- uses: actions/setup-node@v3
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish_staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
if: matrix.platform == 'GH-hosted-ubuntu'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf protobuf-compiler cmake
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf protobuf-compiler cmake fuse libfuse2 mesa-utils mesa-vulkan-drivers
- name: install dependencies (macos only)
if: matrix.platform == 'macos-latest'
Expand Down Expand Up @@ -357,7 +357,7 @@ jobs:
- name: Install Linux Deps
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf protobuf-compiler cmake
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf protobuf-compiler cmake fuse libfuse2 mesa-utils mesa-vulkan-drivers
- name: Install deps
run: pnpm install
Expand Down Expand Up @@ -462,7 +462,7 @@ jobs:
- name: Install Linux Deps
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf protobuf-compiler cmake
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf protobuf-compiler cmake fuse libfuse2 mesa-utils mesa-vulkan-drivers
- uses: actions/setup-node@v3
with:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ This project _loosely_ adheres to [Semantic Versioning](https://semver.org/spec/
- Removed capacitor barcode scanner [PR#502](https://github.com/coasys/ad4m/pull/502)
- Show an error when the code is wrong. [PR#502](https://github.com/coasys/ad4m/pull/502)
- Error handling in connect when hosting is not working [PR#502](https://github.com/coasys/ad4m/pull/502)
- Make new Rust create_subject() implementation wait for Prolog engine to be updated, reflecting the new instance to avoid race conditions [PR#520](https://github.com/coasys/ad4m/pull/520)
- Fix problems with Subject Classes created by other non-progenitor agents, and make isSubjectInstance() more stable agains race conditions [PR#521](https://github.com/coasys/ad4m/pull/521)

### Added
- Prolog predicates needed in new Flux mention notification trigger:
Expand Down
Loading

0 comments on commit 133ad04

Please sign in to comment.