ci: Remove clang-9 entirely from Linux runners

This commit is contained in:
Luke Street 2021-05-02 13:22:49 -04:00
parent 2b626f9a53
commit 341aac4cd9
2 changed files with 8 additions and 2 deletions

View File

@ -38,6 +38,10 @@ jobs:
zlib1g-dev libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev \ zlib1g-dev libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev \
libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev python3 python-is-python3 qt5-default \ libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev python3 python-is-python3 qt5-default \
libcurl4-openssl-dev libcurl4-openssl-dev
# remove clang-9, some related packages were already removed, causing issues
(dpkg -l clang-9 &>/dev/null && sudo apt-get remove --autoremove \
clang-9 clang-format-9 libclang-common-9-dev libllvm9 llvm-9{,-dev}) || true
# free up disk space # free up disk space
# https://github.com/actions/virtual-environments/issues/2840#issuecomment-790492173 # https://github.com/actions/virtual-environments/issues/2840#issuecomment-790492173
echo Before echo Before
@ -57,8 +61,7 @@ jobs:
working-directory: ${{github.workspace}}/build working-directory: ${{github.workspace}}/build
run: | run: |
cmake $GITHUB_WORKSPACE -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo \ cmake $GITHUB_WORKSPACE -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_C_COMPILER=${{matrix.cc}} -DCMAKE_CXX_COMPILER=${{matrix.cxx}} \ -DCMAKE_C_COMPILER=${{matrix.cc}} -DCMAKE_CXX_COMPILER=${{matrix.cxx}}
-DLLVM_ROOT_DIR=/usr/lib/llvm-10
- name: Build - name: Build
working-directory: ${{github.workspace}}/build working-directory: ${{github.workspace}}/build

View File

@ -40,6 +40,9 @@ jobs:
zlib1g-dev libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev \ zlib1g-dev libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev \
libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev python3 python-is-python3 qt5-default \ libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev python3 python-is-python3 qt5-default \
libcurl4-openssl-dev intel-oneapi-ipp-devel libcurl4-openssl-dev intel-oneapi-ipp-devel
# remove clang-9, some related packages were already removed, causing issues
(dpkg -l clang-9 &>/dev/null && sudo apt-get remove --autoremove \
clang-9 clang-format-9 libclang-common-9-dev libllvm9 llvm-9{,-dev}) || true
yarn global add @sentry/cli yarn global add @sentry/cli
echo "$(yarn global bin)" >> $GITHUB_PATH echo "$(yarn global bin)" >> $GITHUB_PATH