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

[ci] Honor default profile according to the system #28

Merged
merged 3 commits into from
Jul 25, 2024
Merged

[ci] Honor default profile according to the system #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec7b5b8
boost 1.85.0
uilianries Jul 24, 2024
3eeac9f
Pass settings via cli
uilianries Jul 24, 2024
d6209ce
use default profile for Linux
uilianries Jul 24, 2024
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
12 changes: 0 additions & 12 deletions .github/conan2/linux_default
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions .github/conan2/macos_default
View file
Open in desktop

This file was deleted.

18 changes: 7 additions & 11 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,13 @@ jobs:
run: |
conan profile detect
conan version
cp .github/conan2/macos_default ~/.conan2/profiles/default
conan profile show
conan profile show -pr default
mkdir -p libs
mkdir -p build

- name: compile x86_64
shell: bash
run: |
conan install . --output-folder=build --build=missing
conan install conanfile.txt --output-folder=build --build=missing -s:h arch=x86_64
cd build
cp ../toolchains/macos-x86_64.cmake conan_toolchain.cmake
LIB_SUFFIX="-macos-x86_64" cmake .. -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release
Expand All @@ -61,7 +59,7 @@ jobs:
- name: compile aarch64
shell: bash
run: |
conan install . --output-folder=build --build=missing
conan install conanfile.txt --output-folder=build --build=missing
cd build
cp ../toolchains/macos-aarch64.cmake conan_toolchain.cmake
LIB_SUFFIX="-macos-aarch64" cmake .. -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release
Expand Down Expand Up @@ -110,15 +108,14 @@ jobs:
run: |
conan profile detect
conan version
cp .github/conan2/linux_default ~/.conan2/profiles/default
conan profile show
conan profile show -pr default
mkdir -p libs
mkdir -p build

- name: compile x86_64
shell: bash
run: |
conan install . --output-folder=build --build=missing
conan install . --output-folder=build --build=missing -s:h arch=x86_64
cd build
LIB_SUFFIX="-linux-x86_64" cmake .. -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release
cmake --build .
Expand Down Expand Up @@ -157,7 +154,7 @@ jobs:
CMakeLists.txt
/usr/local/Cellar
key: ${{ github.sha }}-${{ github.run_id }}

- name: 'Download jextract'
id: jextract
uses: oracle-actions/setup-java@v1
Expand Down Expand Up @@ -208,8 +205,7 @@ jobs:
run: |
conan profile detect
conan version
cp .github/conan2/${{ matrix.TARGET }}_default ~/.conan2/profiles/default
conan profile show
conan profile show -pr default

- name: conan-install
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion conanfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[requires]
boost/1.82.0
boost/1.85.0

[generators]
CMakeDeps
Expand Down
Loading