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.

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

[TEST] Move to conan 2.0 #1339

Draft
wants to merge 9 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 0 additions & 12 deletions .github/workflows/build/linux/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,6 @@ runs:
with:
target: ${{ inputs.target }}

- name: Cache Nix Store
uses: actions/cache@v3
id: nix-cache
with:
path: /tmp/nixcache
key: ${{ runner.os }}-nix-cache

- name: Import Nix Store Cache
if: "steps.nix-cache.outputs.cache-hit == 'true'"
shell: bash
run: nix-store --import < /tmp/nixcache

- name: Build
shell: bash
run: |
Expand Down
15 changes: 3 additions & 12 deletions .github/workflows/build/osx/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ runs:
- name: Install Python Dependencies
shell: bash
run: |
pip3 install --user aqtinstall conan==1.58.0
pip3 install --user aqtinstall conan

- name: Retrieve Qt Cache
id: cache-qt
Expand All @@ -61,15 +61,6 @@ runs:
# Main Build
#

- name: Retrieve Conan Cache
id: cache-conan
uses: actions/cache@v3
with:
key: osx-conan
path: |
~/.conan
~/.conancache

- name: Install Conan Dependencies
shell: bash
run: |
Expand All @@ -79,8 +70,8 @@ runs:
export PATH="$(python3 -m site --user-base)/bin:$PATH"

mkdir build && cd build
conan config set storage.download_cache="${GITHUB_WORKSPACE}/.conancache"
conan install .. --build missing
conan profile detect
conan install .. --build missing -s storage.download_cache="${GITHUB_WORKSPACE}/.conancache"

- name: Build
if: ${{ inputs.cacheOnly == 'false' }}
Expand Down
18 changes: 3 additions & 15 deletions .github/workflows/build/windows/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ runs:

- name: Install Python Dependencies
shell: bash
run: pip3 install --user aqtinstall conan==1.58.0
run: pip3 install --user aqtinstall conan

#
# Retrieve Qt cache (or install it)
Expand Down Expand Up @@ -127,29 +127,17 @@ runs:
# Main Build
#

- name: Retrieve Conan Cache
id: cache-conan
uses: actions/cache@v3
with:
key: windows-conan
path: |
~\.conan
~\.conancache

- name: Setup Conan Profile
if: ${{ steps.cache-conan.outputs.cache-hit != 'true' }}
shell: bash
run: |
conan profile new default --detect
conan profile update settings.compiler="Visual Studio" default
conan profile update settings.compiler.version=17 default
conan profile detect

- name: Install Conan Dependencies
shell: bash
run: |
mkdir build && cd build
conan config set storage.download_cache="${GITHUB_WORKSPACE}/.conancache"
conan install .. --build missing
conan install .. --build missing -s storage.download_cache="${GITHUB_WORKSPACE}/.conancache"

- name: Build
if: ${{ inputs.cacheOnly == 'false' }}
Expand Down
13 changes: 6 additions & 7 deletions conanfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@ cli11/1.9.1
fmt/8.1.1
gtest/1.10.0
pugixml/1.11
tbb/2020.3
onedpl/20200330
onetbb/2021.7.0
toml11/3.7.0
antlr4-cppruntime/4.9.3
antlr4-cppruntime/4.11.1

[generators]
cmake

[options]
fmt:header_only=True
pugixml:header_only=False
tbb:shared=True
antlr4-cppruntime:shared=True
fmt/*:header_only=True
pugixml/*:header_only=False
onetbb/*:shared=True
antlr4-cppruntime/*:shared=True
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
ccls
cmake-format
cmake-language-server
conan-1.58.0
conan
distcc
gdb
openmpi
Expand Down