Skip to content

Commit 3eeac9f

Browse files
committed
Pass settings via cli
Signed-off-by: Uilian Ries <[email protected]>
1 parent ec7b5b8 commit 3eeac9f

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

.github/workflows/build.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,13 @@ jobs:
4141
run: |
4242
conan profile detect
4343
conan version
44-
cp .github/conan2/macos_default ~/.conan2/profiles/default
4544
conan profile show
4645
mkdir -p libs
47-
mkdir -p build
4846
4947
- name: compile x86_64
5048
shell: bash
5149
run: |
52-
conan install . --output-folder=build --build=missing
50+
conan install conanfile.txt --output-folder=build --build=missing -s:h arch=x86_64
5351
cd build
5452
cp ../toolchains/macos-x86_64.cmake conan_toolchain.cmake
5553
LIB_SUFFIX="-macos-x86_64" cmake .. -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release
@@ -61,7 +59,7 @@ jobs:
6159
- name: compile aarch64
6260
shell: bash
6361
run: |
64-
conan install . --output-folder=build --build=missing
62+
conan install conanfile.txt --output-folder=build --build=missing
6563
cd build
6664
cp ../toolchains/macos-aarch64.cmake conan_toolchain.cmake
6765
LIB_SUFFIX="-macos-aarch64" cmake .. -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release
@@ -157,7 +155,7 @@ jobs:
157155
CMakeLists.txt
158156
/usr/local/Cellar
159157
key: ${{ github.sha }}-${{ github.run_id }}
160-
158+
161159
- name: 'Download jextract'
162160
id: jextract
163161
uses: oracle-actions/setup-java@v1

0 commit comments

Comments
 (0)