From c859405c6ae5520eedb8b2100d75a080078d3b87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 12 Jun 2022 22:33:20 +0200 Subject: [PATCH] package/ci: can't test on Xcode 10 anymore. --- package/ci/circleci.yml | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/package/ci/circleci.yml b/package/ci/circleci.yml index 0e56372..ce1e4b0 100644 --- a/package/ci/circleci.yml +++ b/package/ci/circleci.yml @@ -7,11 +7,9 @@ executors: ubuntu-18_04: docker: - image: ubuntu:bionic-20220427 - xcode-10_3: - macos: - xcode: 10.3.0 # Since 2922-05-23, 11.4.1 images wait endlessly for "VM assignment", using - # 11.5 instead. + # 11.5 instead. I would test on 10.3 also, but those also started waiting + # endlessly since 2022-06-09, so it's just 11.5 now. xcode-11_5: macos: xcode: 11.5 @@ -31,21 +29,6 @@ commands: if [[ "$CMAKE_CXX_FLAGS" == *"--coverage"* ]]; then export LCOV_PACKAGES="lcov curl"; fi apt install -y git ninja-build $LCOV_PACKAGES << parameters.extra >> - # ninja needs python@3.9 as a dependency FOR SOME FUCKING REASON and when THE - # DAMN THING installs it, it proceeds with reinstalling python@2. FROM - # SOURCES! FUCK! and then it fails to link it because NO SHIT, python@3.9 is - # already installed! HOW THE FUCK ARE PEOPLE ABLE TO DEAL WITH SUCH CURSED - # SHIT ALL THE TIME?! FUCK OFF - # - # TODO: Needed only on 10.3 and 11.4, not on 11.5 anymore, remove once those - # images are not used anymore. - macos-remove-python-curse: - steps: - - run: - name: Remove Python 2 curse - command: | - HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall python@2 - install-base-macos: parameters: extra: @@ -264,14 +247,11 @@ jobs: - lcov macos-gl: - # 10.2 and below has pybind11 2.2, which is just too old (we removed - # support for that in aae98e0f02e927f993713afc154da1f3673ebb3e, July 2019) - executor: xcode-10_3 + executor: xcode-11_5 environment: CMAKE_CXX_FLAGS: --coverage PLATFORM_GL_API: CGL steps: - - macos-remove-python-curse - install-base-macos: extra: sdl2 glfw numpy pybind11 - build: @@ -279,8 +259,6 @@ jobs: - lcov macos-gles3: - # Using the same executor as Magnum uses for the ES3 build. 10.3 fails to - # load the libGLESv2.dylib due to "Symbol not found: _objc_opt_class". executor: xcode-11_5 environment: CMAKE_CXX_FLAGS: --coverage @@ -297,16 +275,13 @@ jobs: - lcov macos-static: - # 10.2 and below has pybind11 2.2, which is just too old (we removed - # support for that in aae98e0f02e927f993713afc154da1f3673ebb3e, July 2019) - executor: xcode-10_3 + executor: xcode-11_5 environment: # STUPID yml interprets unquoted ON as a boolean BUILD_STATIC: "ON" CMAKE_CXX_FLAGS: --coverage PLATFORM_GL_API: CGL steps: - - macos-remove-python-curse - install-base-macos: extra: sdl2 glfw numpy pybind11 - build: