Skip to content

Commit

Permalink
Merge pull request #103 from ostis-ai/develop
Browse files Browse the repository at this point in the history
feat: update main branch before Release 0.9.0-Unlock
  • Loading branch information
NikitaZotov authored Jan 22, 2024
2 parents db59d15 + b953fc1 commit 2ab7b6d
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 190 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Unless otherwise indicated, the Source Code is licensed under the MIT license.

Copyright (c) 2010-2022 OSTIS
Copyright (c) 2010-2024 OSTIS

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
web:
image: ostis/sc-web:0.8.0-Fusion
image: ostis/sc-web:0.8.1-Unlock
build:
context: ./sc-web
restart: unless-stopped
Expand All @@ -15,7 +15,7 @@ services:
condition: service_healthy

machine:
image: ostis/sc-machine:0.8.0-Fusion
image: ostis/sc-machine:0.9.0-Unlock
build:
context: ./sc-machine
restart: unless-stopped
Expand Down
31 changes: 31 additions & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,65 +4,96 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.9.0-Unlock] - 22.01.2024

### Changes

- Update config by sc-machine config 0.9.0
- Update license year

### Removed

- Script `prepare.sh`
- Script `run_scweb.sh`

## [0.8.0-Fusion] - 24.09.2023

### Added

- Generalize all scripts
- Configure events and agents threads

### Changed

- Link scripts with sc-machine and sc-web scripts
- Unify config file for sc-server and sc-builder

### Deprecated

- Deprecate `run_scweb.sh`, add `run_sc_web.sh` instead
- Deprecate and divide `prepare.sh` into `install_submodules.sh`, `install_dependencies.sh`, `build_sc_machine.sh` and `build_sc_web.sh`

### Removed

- Remove windows scripts
- Remove drawings and scp scripts
- Remove dump scripts
- Remove sctp-server scripts

## [0.7.0-Rebirth] - 13.10.2022

### Breaking actions

- Remove sctp-server scripts from projects that use ostis-web-platform
- Use py-sc-client and ts-sc-client for sc-server instead of sctp-clients for sctp-server

### Added

- Add latex documentation from OSTIS Standard
- Add CI

### Changed

- Unify config file for sc-server and sc-builder

### Removed

- Remove sctp-server scripts


## [0.7.0-Rebirth] - 13.10.2022

### Breaking actions

- Remove sctp-server scripts from projects that use ostis-web-platform
- Use py-sc-client and ts-sc-client for sc-server instead of sctp-clients for sctp-server

### Added

- Add latex documentation from OSTIS Standard
- Add CI

### Changed

- Unify config file for sc-server and sc-builder

### Removed

- Remove sctp-server scripts

## [0.6.1] - 28.04.2022

### Added

- Add sc-machine gitmodules initiation

### Changed

- Set modules links to ostis-ai repos
- Set sc-machine to 0.6.1
- Set sc-web to 0.6.1
- Set ims.ostis.kb to 0.2.1

### Removed

- Remove yarn web interface build
2 changes: 1 addition & 1 deletion ims.ostis.kb
Submodule ims.ostis.kb updated 369 files
13 changes: 8 additions & 5 deletions ostis-web-platform.ini
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
[sc-memory]
max_loaded_segments = 1000
max_threads = 32

limit_max_threads_by_max_physical_cores = true
max_events_and_agents_threads = 32

save_period = 3600
update_period = 1800
dump_memory = false
dump_memory_period = 3600
dump_memory_statistics = false
dump_memory_statistics_period = 1200

repo_path = kb.bin
extensions_path = sc-machine/bin/extensions

log_type = File
log_type = Console
log_file = sc-machine/sc-memory.log
log_level = Info

Expand All @@ -25,7 +28,7 @@ term_separators = " _"
host = 127.0.0.1
port = 8090

sync_actions = 0
parallel_actions = true

log_type = File
log_file = sc-machine/sc-server.log
Expand Down
165 changes: 0 additions & 165 deletions scripts/prepare.sh

This file was deleted.

14 changes: 0 additions & 14 deletions scripts/run_scweb.sh

This file was deleted.

4 changes: 2 additions & 2 deletions scripts/set_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ export CONFIG_PATH="${CONFIG_PATH:-${PLATFORM_PATH}/ostis-web-platform.ini}"
export REPO_PATH="${REPO_PATH:-${PLATFORM_PATH}/repo.path}"

export SC_MACHINE_REPO="${SC_MACHINE_REPO:-https://github.com/ostis-ai/sc-machine.git}"
export SC_MACHINE_BRANCH="${SC_MACHINE_BRANCH:-0.8.0-Fusion}"
export SC_MACHINE_BRANCH="${SC_MACHINE_BRANCH:-0.9.0-Unlock}"
export SC_MACHINE_COMMIT="${SC_MACHINE_COMMIT:-""}"
export SC_MACHINE_PATH="${SC_MACHINE_PATH:-${PLATFORM_PATH}/sc-machine}"

export SC_WEB_REPO="${SC_WEB_REPO:-https://github.com/ostis-ai/sc-web.git}"
export SC_WEB_BRANCH="${SC_WEB_BRANCH:-0.8.0-Fusion}"
export SC_WEB_BRANCH="${SC_WEB_BRANCH:-0.8.1-Unlock}"
export SC_WEB_COMMIT="${SC_WEB_COMMIT:-""}"
export SC_WEB_PATH="${SC_WEB_PATH:-${PLATFORM_PATH}/sc-web}"

Expand Down

0 comments on commit 2ab7b6d

Please sign in to comment.