Skip to content

Commit

Permalink
Merge pull request #458 from NikitaZotov/feat/update_conan_cd_and_docs
Browse files Browse the repository at this point in the history
Update conan cd and docs
  • Loading branch information
NikitaZotov authored Jan 17, 2025
2 parents 5b4a3d0 + daa7aef commit dbcc8c3
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 7 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,19 @@ jobs:
cmake --preset release-conan
cmake --build --preset release
- name: Set Conan remote
run: |
conan remote add ostis-ai https://conan.ostis.net/artifactory/api/conan/ostis-ai-sc-machine/
conan remote login ostis-ai ${{ secrets.CONAN_USERNAME }} -p ${{ secrets.CONAN_API_KEY }}
- name: Create Conan package
run: |
conan export-pkg .
- name: Upload to Conan remote
run: |
conan upload sc-machine/${{ github.ref_name }} -r ostis-ai
- name: Create archive
run: |
cd ./build/Release
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.24)
set(CMAKE_CXX_STANDARD 17)
project(sc-machine VERSION 0.9.0 LANGUAGES C CXX)
project(sc-machine VERSION 0.10.0 LANGUAGES C CXX)
message(STATUS "Current project version: ${CMAKE_PROJECT_VERSION}")
site_name(www.ostis.net)
cmake_policy(SET CMP0048 NEW)
Expand Down
2 changes: 1 addition & 1 deletion COPYING.MIT
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Unless otherwise indicated, Source Code is licensed under MIT license.

Copyright (c) 2010-2024 OSTIS
Copyright (c) 2010-2025 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 in
Expand Down
11 changes: 7 additions & 4 deletions docs/build/build_system.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,10 @@ list(APPEND CMAKE_PREFIX_PATH ${<proj_name>_SC_MACHINE_PATH})
```

```sh
conan install .
# Add remote repository to your Conan client configuration
conan remote add ostis-ai https://conan.ostis.net/artifactory/api/conan/ostis-ai-sc-machine

conan install . --build=missing
cmake --preset conan-release
cmake --build --preset conan-release
```
Expand Down Expand Up @@ -256,8 +259,8 @@ It is possible to write tests for the Conan packaging using [local package devel

## Troubleshooting

- If you encounter issues with Conan, try clearing the Conan cache: `conan cache clean`
- For CMake configuration issues, check the CMakeCache.txt file in your build directory
- Ensure that your CMake version is compatible with the project requirements
- If you encounter issues with Conan, try clearing the Conan cache: `conan cache clean`.
- For CMake configuration issues, check the CMakeCache.txt file in your build directory.
- Ensure that your CMake version is compatible with the project requirements.

For further assistance, please consult the [project's issue tracker](https://github.com/ostis-ai/sc-machine/issues) or contact the maintainers.
8 changes: 7 additions & 1 deletion docs/quick_start.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,16 @@ You can use Conan to install sc-machine. To do this you need to create `conanfil
sc-machine/<version>
```

Add remote repository to your Conan client configuration:

```sh
conan remote add ostis-ai https://conan.ostis.net/artifactory/api/conan/ostis-ai-sc-machine
```

Then run the following command in the project root:

```sh
conan install .
conan install . --build=missing
```

Import sc-machine targets into your CMake project by using:
Expand Down

0 comments on commit dbcc8c3

Please sign in to comment.