Skip to content

Commit

Permalink
CI Fixes
Browse files Browse the repository at this point in the history
- Attempt to fix Ubuntu builds (install mesa libraries to provide the OpenGL headers)
- Removed `os.version` flag for macOS builds, otherwise all dependencies will be built from scratch
  • Loading branch information
yowidin committed Sep 14, 2021
1 parent 9a2647a commit 367e2a7
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
8 changes: 5 additions & 3 deletions .ci/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@
kwargs = {'cwd': '_build', 'check': True}
install_args = ['conan', 'install', '..', '-b', 'missing', '-s', 'compiler.cppstd=17']

if platform == 'darwin':
# Build for High Sierra and x64
install_args.extend(['-s', 'os.version=10.13', '-s', 'arch=x86_64'])
# NOTE: Disabled until conan-burrito recipes are not recompiled using the same OS version
# otherwise MacOS builds would take an eternity
# if platform == 'darwin':
# # Build for High Sierra and x64
# install_args.extend(['-s', 'os.version=10.13', '-s', 'arch=x86_64'])

run(install_args, **kwargs)
run(['conan', 'build', '..'], **kwargs)
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ jobs:
conan config install ${{ github.workspace }}/profiles/settings.yml
conan remote add -i 0 conan_burrito "${{ env.CONAN_REMOTE }}"
conan user -r conan_burrito "${{ env.CONAN_USER }}" -p "${{ env.CONAN_PASSWORD }}"
- name: Install OpenGL
if: startsWith(matrix.os, 'ubuntu')
run: |
sudo apt-get update
sudo apt-get install mesa-common-dev
- name: Build native
run: |
python .ci/build.py
Expand Down

0 comments on commit 367e2a7

Please sign in to comment.