Skip to content

Commit 5141e75

Browse files
authored
Fix CI Setup (#3456)
Two CIs (one GCC and one Clang/CUDA) have been failing because of libunwind package conflict issues. This PR fixes them by (1) switching to clang-tidy-15 in the GCC test and (2) explicitly installing libunwind-15 and libunwind-15-dev in Clang test.
1 parent cf8d9f8 commit 5141e75

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

.github/workflows/dependencies/dependencies_llvm_cuda11_ubuntu22.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ sudo apt-get -qqq update
1010
sudo apt-get install -y \
1111
build-essential \
1212
ca-certificates \
13+
libunwind-15 \
14+
libunwind-15-dev \
1315
clang-15 \
1416
libc++-15-dev \
1517
libc++abi-15-dev \

.github/workflows/gcc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ jobs:
442442
- name: Dependencies
443443
run: |
444444
.github/workflows/dependencies/dependencies.sh
445-
.github/workflows/dependencies/dependencies_clang-tidy.sh 12
445+
.github/workflows/dependencies/dependencies_clang-tidy.sh 15
446446
.github/workflows/dependencies/dependencies_ccache.sh
447447
- name: Set Up Cache
448448
uses: actions/cache@v3
@@ -467,7 +467,7 @@ jobs:
467467
468468
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
469469
make -j2 -f clang-tidy-ccache-misses.mak \
470-
CLANG_TIDY=clang-tidy-12 \
470+
CLANG_TIDY=clang-tidy-15 \
471471
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
472472
473473
ccache -s

Src/F_Interfaces/Base/AMReX_init_fi.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ extern "C"
1313
{
1414
using amrex_void_cfun = void (*)();
1515

16-
void amrex_fi_init (char* cmd, int fcomm, int arg_parmparse, amrex_void_cfun proc_parmparse)
16+
void amrex_fi_init (char const* cmd, int fcomm, int arg_parmparse, amrex_void_cfun proc_parmparse)
1717
{
1818
std::istringstream is(cmd);
1919
amrex::Vector<std::string> argv_string(std::istream_iterator<std::string>{is},

0 commit comments

Comments
 (0)