Skip to content

Commit

Permalink
Revert introduction conan.lock
Browse files Browse the repository at this point in the history
  • Loading branch information
pnoltes committed Jun 16, 2024
1 parent 8f678b5 commit e5a0640
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 60 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.conan2
key: cache-conan-${{ hashFiles('conan.lock') }}
restore-keys: |
cache-conan-
key: conan-container-cache-${{ runner.os }}-${{ hashFiles('conanfile.py') }}
restore-keys: conan-container-cache-${{ runner.os }}-
- name: Build container image
run: |
docker build --tag apache/celix-conan-build:latest --target conan-build --file .devcontainer/Containerfile .
Expand Down
41 changes: 0 additions & 41 deletions conan.lock

This file was deleted.

16 changes: 0 additions & 16 deletions documents/development/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -612,19 +612,3 @@ add_library(celix::my_bundle ALIAS my_bundle)
- Code should be checked for memory leaks using AddressSanitizer.
- Coverity scan are done on the master on a regular basis. Ideally new coverity issues should be fixed as soon as
possible.

## Conan Dependencies Locking

If Conan is used as a build tool, the dependencies are locked using a `conan.lock` file.
This file is committed to source control and should be periodically updated when dependencies change.

The lock file is used to ensure CI build caches and that developers work with the same dependencies.

When updating dependencies, the following Conan command should be used:

```bash
conan lock create --options build_all=True --options enable_address_sanitizer=True --options enable_testing=True --options enable_ccache=True --conf tools.cmake.cmaketoolchain:generator=Ninja .
```

This command ensures that all the dependencies needed for different build options are enabled and locked, including some
build dependencies like ccache and Ninja.

0 comments on commit e5a0640

Please sign in to comment.