diff --git a/.ci/build.py b/.ci/build.py index 44009b0..307325e 100755 --- a/.ci/build.py +++ b/.ci/build.py @@ -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) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8cff927..ae8819f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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