Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

github CI: update conan #2537

Merged
merged 2 commits into from
Mar 6, 2023
Merged

github CI: update conan #2537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f019d31
github CI: update conan
neheb Mar 5, 2023
37dde9e
github CI: remove NoConan
neheb Mar 5, 2023
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 .github/workflows/on_PR_linux_staticAnalysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

- name: Configure
run: |
cmake --preset linux-debug-NoConan -S . -B build -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
cmake --preset linux-debug -S . -B build -DCMAKE_EXPORT_COMPILE_COMMANDS=ON

- name: Static Analysis
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_PR_windows_matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:

- name: Install Conan & Common config
run: |
python -m pip install conan==1.55.0
python -m pip install conan==1.59.0
conan config install https://github.com/conan-io/conanclientcert.git
conan profile new --detect default
conan profile update settings.build_type=${{matrix.build_type}} default
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/on_push_BasicWinLinMac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- name: Install Conan & Common config
run: |
python -m pip install conan==1.55.0
python -m pip install conan==1.59.0
conan profile new --detect default
conan profile show default
conan profile update settings.compiler="Visual Studio" default
Expand All @@ -62,7 +62,7 @@ jobs:

- name: install dependencies
run: |
python3 -m pip install conan==1.55.0 ninja
python3 -m pip install conan==1.59.0 ninja

- name: Conan
run: |
Expand All @@ -74,7 +74,7 @@ jobs:

- name: build and compile
run: |
cmake --preset linux-release-NoConan -S . -B build
cmake --preset linux-release -S . -B build
cmake --build build --parallel

- name: Test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Install dependencies
run: |
sudo apt install -y gettext doxygen graphviz
python -m pip install conan==1.55.0 ninja
python -m pip install conan==1.59.0 ninja

- name: Conan common config
run: |
Expand Down