diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 77fabb4fe568..709d1c5f05bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -119,9 +119,6 @@ jobs: env: {CXX: g++, CC: gcc, ALPAKA_CI_GCC_VER: 12, ALPAKA_CI_STDLIB: libstdc++, CMAKE_BUILD_TYPE: Debug, ALPAKA_BOOST_VERSION: 1.80.0, ALPAKA_CI_CMAKE_VER: 3.23.5, OMP_NUM_THREADS: 4, ALPAKA_CI_DOCKER_BASE_IMAGE_NAME: "ubuntu:22.04", ALPAKA_CI_ANALYSIS: ON, alpaka_DEBUG: 2} ### macOS - - name: macos_xcode-13.2.1_debug - os: macos-11 - env: {CXX: clang++, CC: clang, ALPAKA_CI_XCODE_VER: 13.2.1, CMAKE_BUILD_TYPE: Debug, ALPAKA_BOOST_VERSION: 1.76.0, alpaka_ACC_CPU_B_OMP2_T_SEQ_ENABLE: ON, alpaka_ACC_CPU_B_SEQ_T_OMP2_ENABLE: ON, ALPAKA_CI_BUILD_JOBS: 3} - name: macos_xcode-14.2_release os: macos-12 env: {CXX: clang++, CC: clang, ALPAKA_CI_XCODE_VER: 14.2, CMAKE_BUILD_TYPE: Release, ALPAKA_BOOST_VERSION: 1.81.0, alpaka_ACC_CPU_B_OMP2_T_SEQ_ENABLE: ON, alpaka_ACC_CPU_B_SEQ_T_OMP2_ENABLE: ON, ALPAKA_CI_BUILD_JOBS: 3} diff --git a/script/install_omp.sh b/script/install_omp.sh index 5209861fd80d..da3c07752ca3 100755 --- a/script/install_omp.sh +++ b/script/install_omp.sh @@ -10,5 +10,11 @@ source ./script/set.sh if [ "$ALPAKA_CI_OS_NAME" = "macOS" ] then + # workaround to avoid link issues from python 2 to 3 during libomp dependency installation + rm '/usr/local/bin/2to3-3.12' + rm '/usr/local/bin/idle3.12' + rm '/usr/local/bin/pydoc3.12' + rm '/usr/local/bin/python3.12' + rm '/usr/local/bin/python3.12-config' brew reinstall --build-from-source --formula ./script/homebrew/${ALPAKA_CI_XCODE_VER}/libomp.rb fi