Skip to content
Open
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
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],
// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "conan remote add local-recipes ./deps --type=local-recipes-index", // Add a local recipes store for odb libraries
"postCreateCommand": "git submodule update --init && conan remote add local-recipes ./deps/conan-tourmalinecore-index --type=local-recipes-index", // Add a local recipes store for odb libraries
// Configure tool-specific properties.
// "customizations": {},
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/reusable-docker-build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:
steps:
- name: Check out the repo
uses: actions/checkout@v7
with:
submodules: true

# this is needed to address this issue according to the comment https://github.com/devcontainers/ci/issues/271#issuecomment-2301764487
# otherwise our TourmalineCore org name cannot be used in docker image names, only tourmalinecore
Expand Down Expand Up @@ -79,6 +81,8 @@ jobs:
steps:
- name: Check out the repo
uses: actions/checkout@v4
with:
submodules: true

# this is needed to address this issue according to the comment https://github.com/devcontainers/ci/issues/271#issuecomment-2301764487
# otherwise our TourmalineCore org name cannot be used in docker image names, only tourmalinecore
Expand Down
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "deps/conan-tourmalinecore-index"]
path = deps/conan-tourmalinecore-index
url = https://github.com/TourmalineCore/conan-tourmalinecore-recipes.git
branch = "feature/#70-preparing-prs-for-the-libodb-and-libodb-pgsql-packages-in-the-conan-center-index"
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN apt-get -y install --no-install-recommends \
RUN pip install conan

# this is necessary so that Conan can see the local dependency recipes
RUN conan remote add local-recipes ./deps --type=local-recipes-index
RUN conan remote add local-recipes ./deps/conan-tourmalinecore-index --type=local-recipes-index

RUN conan build . --build=missing \
--profile:all=.devcontainer/to-dos-conan-profile.conf \
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ For development purposes use a devcontainer named `developing`.

### Project building

First, you need to update the `conan-tourmalinecore-index` submodule, which contains Conan recipes for project dependencies not included in `conan-center-index`. Without this step, the project build will fail.

> If you're working inside a VSCode devcontainer, the submodules were pulled automatically; check the `deps/` directory.

To do this, run the command `git submodule update --init`. After running this command, the submodules will be pulled locally based on the state of the submodule’s fixed commit. If you need to update a fixed commit in the submodule, run the command `git submodule update --init --remote`.

To build this project, open the VS Code terminal (`Ctrl + Shift + ~`) and run `conan install . --build=missing`.
After the Conan install process, open the CMake extension and click Configure.
<p style="text-align: center;"><img src="docs/images/cmakeConfigure.png" alt="cmakeConfigure" width="400"/></p>
Expand Down
1 change: 1 addition & 0 deletions deps/conan-tourmalinecore-index
154 changes: 0 additions & 154 deletions deps/recipes/libodb-pgsql/all/conanfile.py

This file was deleted.

3 changes: 0 additions & 3 deletions deps/recipes/libodb-pgsql/config.yml

This file was deleted.

124 changes: 0 additions & 124 deletions deps/recipes/libodb/all/conanfile.py

This file was deleted.

3 changes: 0 additions & 3 deletions deps/recipes/libodb/config.yml

This file was deleted.

Loading