Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions .github/workflows/ci-manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ on:
required: true
default: "[\"Debug\", \"Release\", \"RelWithDebInfo\", \"MinSizeRel\"]"
type: string
run-das-tests:
description: 'Run DAS integration tests'
required: true
default: true
type: boolean

jobs:
ci-manual:
Expand All @@ -51,14 +46,3 @@ jobs:
python-version: ${{ matrix.python-version }}
cmake-version: ${{ matrix.cmake-version }}
build-type: ${{ matrix.build-type }}

das-tests:
if: ${{ inputs.run-das-tests }}
strategy:
matrix:
os: ${{ fromJson(inputs.os) }}
max-parallel: 5
needs: ci-manual
uses: ./.github/workflows/das-tests.yml
with:
os: ${{ matrix.os }}
10 changes: 1 addition & 9 deletions .github/workflows/ci-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,5 @@ jobs:
build-type: ${{ matrix.build-type }}

das-tests:
if: github.repository == 'trueagi-io/hyperon-experimental'
needs: ci-nightly
strategy:
fail-fast: false
matrix:
os: ["ubuntu-22.04", "ubuntu-24.04", "macos-13", "macos-14", "macos-15", "windows-latest"]
max-parallel: 5
if: ${{ github.event_name != 'schedule' || github.repository == 'trueagi-io/hyperon-experimental' }}
uses: ./.github/workflows/das-tests.yml
with:
os: ${{ matrix.os }}
44 changes: 24 additions & 20 deletions .github/workflows/das-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,11 @@ name: das-tests

on:
workflow_call:
inputs:
os:
description: "A container which is used to make a build"
default: "ubuntu-22.04"
required: false
type: string
workflow_dispatch:

jobs:
setup-and-test:
runs-on: ${{ inputs.os }}
das-tests:
runs-on: "ubuntu-24.04"

steps:
- name: Check out repository code
Expand All @@ -28,14 +23,8 @@ jobs:
- name: Install protobuf-compiler (required by Das)
shell: bash
run: |
if [[ "${{ inputs.os }}" == *"ubuntu"* ]]; then
sudo apt-get update
sudo apt-get install -y protobuf-compiler
elif [[ "${{ inputs.os }}" == *"macos"* ]]; then
brew install protobuf
elif [[ "${{ inputs.os }}" == *"windows"* ]]; then
choco install protoc -y
fi
sudo apt-get update
sudo apt-get install -y protobuf-compiler

- name: Build
shell: bash
Expand All @@ -46,38 +35,51 @@ jobs:
with:
python-version: "3.13"

- name: das-toolbox - create Python venv
shell: bash
run: |
python3 -m venv dastoolbox

- name: das-toolbox - install
shell: bash
run: |
source ./dastoolbox/bin/activate
TEMP_DIR=$(mktemp -d)
cd "$TEMP_DIR"
git clone https://github.com/singnet/das-toolbox.git
cd das-toolbox
git checkout tags/0.5.0
cd das-cli/src
sudo pip3 install -e .
sudo rm -rf "$TEMP_DIR"
# TODO: should be a part of das-cli/setup.py file
python3 -m pip install -r requirements.txt
# TODO: -e should not be needed and temporary dir could be cleaned
# up after installation
python3 -m pip install -e .
cd "$GITHUB_WORKSPACE"

- name: das-toolbox - DAS configuration
shell: bash
run: |
source ./dastoolbox/bin/activate
# Configure DAS with default settings
echo -e "\n\n\n\n\n\n\n37007\n\n\n\n\n\n\n\n\n\n\n" | das-cli config set

- name: das-toolbox - start databases
shell: bash
run: |
source ./dastoolbox/bin/activate
das-cli db start

- name: das-toolbox - load knowledge base
shell: bash
run: |
das-cli metta load integration_tests/das/animals.metta
source ./dastoolbox/bin/activate
das-cli metta load ${GITHUB_WORKSPACE}/integration_tests/das/animals.metta

- name: das-toolbox - start services
shell: bash
run: |
source ./dastoolbox/bin/activate
# Attention Broker
das-cli ab start
# Query Agent
Expand All @@ -86,12 +88,14 @@ jobs:
- name: Run DAS module tests
shell: bash
run: |
timeout 60s ./target/release/metta-repl integration_tests/das/test.metta || true
source ./dastoolbox/bin/activate
timeout 60s ./target/release/metta-repl ./integration_tests/das/test.metta

- name: das-toolbox - cleanup services
if: always()
shell: bash
run: |
source ./dastoolbox/bin/activate
das-cli qa stop || true
das-cli ab stop || true
das-cli db stop || true