From a5db453e80492a4aef84fa462033550a418401a9 Mon Sep 17 00:00:00 2001 From: Hubert Maciak Date: Tue, 11 Feb 2025 11:23:26 +0100 Subject: [PATCH] ci: linters: downgrade clang --- .github/automation/build_linters.sh | 10 +++++++++- .github/workflows/pr-linter.yml | 5 +++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/automation/build_linters.sh b/.github/automation/build_linters.sh index 6ae4717167e..a80ba6452db 100755 --- a/.github/automation/build_linters.sh +++ b/.github/automation/build_linters.sh @@ -5,6 +5,14 @@ set -o errexit -o pipefail -o noclobber export CC=clang export CXX=clang++ +if [ -n "$CLANG_VERSION" ]; then + export CC=clang-$CLANG_VERSION + export CXX=clang++-$CLANG_VERSION +else + export CC=clang + export CXX=clang++ +fi + if [[ "$ONEDNN_ACTION" == "configure" ]]; then if [[ "$GITHUB_JOB" == "pr-clang-tidy" ]]; then set -x @@ -33,7 +41,7 @@ if [[ "$ONEDNN_ACTION" == "configure" ]]; then fi elif [[ "$ONEDNN_ACTION" == "build" ]]; then set -x - cmake --build build + cmake --build build -j4 set +x else echo "Unknown action: $ONEDNN_ACTION" diff --git a/.github/workflows/pr-linter.yml b/.github/workflows/pr-linter.yml index 82093804d1d..56231026a85 100644 --- a/.github/workflows/pr-linter.yml +++ b/.github/workflows/pr-linter.yml @@ -82,7 +82,7 @@ jobs: pr-clang-tidy: name: Clang-Tidy - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout oneDNN uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -90,12 +90,13 @@ jobs: - name: Install clang run: | sudo apt-get update - sudo apt-get install -y clang libomp-dev ocl-icd-libopencl1 ocl-icd-opencl-dev + sudo apt-get install -y clang-12 libomp-dev ocl-icd-libopencl1 ocl-icd-opencl-dev - name: Configure oneDNN run: .github/automation/build_linters.sh env: ONEDNN_ACTION: configure + CLANG_VERSION: 12 - name: Build oneDNN run: |