Skip to content

Commit 367e2a7

Browse files
committed
CI Fixes
- 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
1 parent 9a2647a commit 367e2a7

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

.ci/build.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@
1010
kwargs = {'cwd': '_build', 'check': True}
1111
install_args = ['conan', 'install', '..', '-b', 'missing', '-s', 'compiler.cppstd=17']
1212

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

1719
run(install_args, **kwargs)
1820
run(['conan', 'build', '..'], **kwargs)

.github/workflows/main.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ jobs:
4242
conan config install ${{ github.workspace }}/profiles/settings.yml
4343
conan remote add -i 0 conan_burrito "${{ env.CONAN_REMOTE }}"
4444
conan user -r conan_burrito "${{ env.CONAN_USER }}" -p "${{ env.CONAN_PASSWORD }}"
45-
45+
- name: Install OpenGL
46+
if: startsWith(matrix.os, 'ubuntu')
47+
run: |
48+
sudo apt-get update
49+
sudo apt-get install mesa-common-dev
4650
- name: Build native
4751
run: |
4852
python .ci/build.py

0 commit comments

Comments
 (0)