Skip to content

Commit

Permalink
Fix Build Files
Browse files Browse the repository at this point in the history
  • Loading branch information
nlogozzo committed Dec 8, 2023
1 parent a87a30b commit 8aebdd6
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
matrix:
config:
- name: "x64"
- name: "Build on x64"
os: ubuntu-latest
artifact: "Linux-x64"
env:
Expand All @@ -37,7 +37,10 @@ jobs:
mv conan/conansettings.yml settings_user.yml
conan config install settings_user.yml
- name: "Install Conan"
run: conan install conan/conanfile-linux.txt --profile:host=conan/conanprofile-linux.txt --profile:build=conan/conanprofile-linux.txt -s compiler.cppstd=20 --build=missing
run: |
mv conan/conanfile-linux.txt conanfile.txt
mv conan/conanprofile-linux.txt conanprofile.txt
conan install conanfile.txt --profile:host=conanprofile.txt --profile:build=conanprofile.txt -s compiler.cppstd=20 --build=missing
- name: "CMake Build"
working-directory: ${{github.workspace}}/build
run: |
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
matrix:
config:
- name: "x64"
- name: "Build on x64"
os: windows-latest
artifact: "Windows-x64"
fail-fast: false
Expand All @@ -30,7 +30,10 @@ jobs:
- name: "Get Conan"
uses: turtlebrowser/get-conan@main
- name: "Install Conan"
run: conan install conan/conanfile-windows.txt --profile:host=conan/conanprofile-windows.txt --profile:build=conan/conanprofile-windows.txt -s compiler.cppstd=20 --build=missing
run: |
move conan/conanfile-windows.txt conanfile.txt
move conan/conanprofile-windows.txt conanprofile.txt
conan install conanfile.txt --profile:host=conanprofile.txt --profile:build=conanprofile.txt -s compiler.cppstd=20 --build=missing
- name: "CMake Build"
working-directory: ${{github.workspace}}/build
run: |
Expand Down

0 comments on commit 8aebdd6

Please sign in to comment.