File tree Expand file tree Collapse file tree 4 files changed +8
-8
lines changed Expand file tree Collapse file tree 4 files changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -80,10 +80,10 @@ task:
8080    <<  : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV 
8181
8282task :
83-   name : ' tidy [jammy ]' 
83+   name : ' tidy [bookworm ]' 
8484  <<  : *GLOBAL_TASK_TEMPLATE 
8585  container :
86-     image : ubuntu:jammy 
86+     image : debian:bookworm 
8787    cpu : 2 
8888    memory : 5G 
8989  #  For faster CI feedback, immediately schedule the linters
Original file line number Diff line number Diff line change 66
77export  LC_ALL=C.UTF-8
88
9- export  CI_IMAGE_NAME_TAG=" ubuntu:22.04 " 
9+ export  CI_IMAGE_NAME_TAG=" debian:bookworm " 
1010export  CONTAINER_NAME=ci_native_tidy
11- export  PACKAGES=" clang libclang-dev llvm-dev clang-tidy bear cmake libevent-dev libboost-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev systemtap-sdt-dev libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools libqrencode-dev libsqlite3-dev libdb++-dev" 
11+ export  PACKAGES=" clang-15  libclang-15- dev llvm-15- dev clang-tidy-15  bear cmake libevent-dev libboost-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev systemtap-sdt-dev libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools libqrencode-dev libsqlite3-dev libdb++-dev" 
1212export  NO_DEPENDS=1
1313export  RUN_UNIT_TESTS=false
1414export  RUN_FUNCTIONAL_TESTS=false
1515export  RUN_FUZZ_TESTS=false
1616export  RUN_TIDY=true
1717export  GOAL=" install" 
18- export  BITCOIN_CONFIG=" CC=clang CXX=clang++ --with-incompatible-bdb --disable-hardening CFLAGS='-O0 -g0' CXXFLAGS='-O0 -g0'" 
18+ export  BITCOIN_CONFIG=" CC=clang-15  CXX=clang++-15  --with-incompatible-bdb --disable-hardening CFLAGS='-O0 -g0' CXXFLAGS='-O0 -g0'" 
1919export  CCACHE_SIZE=200M
Original file line number Diff line number Diff line change @@ -135,8 +135,8 @@ if [[ "${RUN_TIDY}" == "true" ]]; then
135135  export  DIR_IWYU=" ${BASE_SCRATCH_DIR} /iwyu" 
136136  if  [ !  -d  " ${DIR_IWYU} "   ];  then 
137137    CI_EXEC " mkdir -p ${DIR_IWYU} /build/" 
138-     CI_EXEC " git clone --depth=1 https://github.com/include-what-you-use/include-what-you-use -b clang_14  ${DIR_IWYU} /include-what-you-use" 
139-     CI_EXEC " cd ${DIR_IWYU} /build && cmake -G 'Unix Makefiles' -DCMAKE_PREFIX_PATH=/usr/lib/llvm-14  ../include-what-you-use" 
138+     CI_EXEC " git clone --depth=1 https://github.com/include-what-you-use/include-what-you-use -b clang_15  ${DIR_IWYU} /include-what-you-use" 
139+     CI_EXEC " cd ${DIR_IWYU} /build && cmake -G 'Unix Makefiles' -DCMAKE_PREFIX_PATH=/usr/lib/llvm-15  ../include-what-you-use" 
140140    CI_EXEC_ROOT " cd ${DIR_IWYU} /build && make install $MAKEJOBS " 
141141  fi 
142142fi 
Original file line number Diff line number Diff line change 3939if  [ " ${RUN_TIDY} "   =  " true"   ];  then 
4040  set  -eo pipefail
4141  export  P_CI_DIR=" ${BASE_BUILD_DIR} /bitcoin-$HOST /src/" 
42-   ( CI_EXEC run-clang-tidy -quiet " ${MAKEJOBS} "   ) |  grep -C5 " error" 
42+   ( CI_EXEC run-clang-tidy-15  -quiet " ${MAKEJOBS} "   ) |  grep -C5 " error" 
4343  export  P_CI_DIR=" ${BASE_BUILD_DIR} /bitcoin-$HOST /" 
4444  CI_EXEC " python3 ${DIR_IWYU} /include-what-you-use/iwyu_tool.py"  \
4545          "  src/common/init.cpp"  \
    
 
   
 
     
   
   
          
     
  
    
     
 
    
      
     
 
     
    You can’t perform that action at this time.
  
 
    
  
     
    
      
        
     
 
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments