Fix CI

* Update compiler in macOS * Avoid error/warning due to rocm 6+
cp2k · May 14, 2024 · 1904f2a · 1904f2a
1 parent fcff710
commit 1904f2a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/testing-macos.yml b/.github/workflows/testing-macos.yml
@@ -8,7 +8,7 @@ on:
 
 # Workaround issue in Xcode 14.1/2
 env:
-  DEVELOPER_DIR: /Applications/Xcode_14.0.1.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
 
 jobs:
   build-and-test:
@@ -45,7 +45,7 @@ jobs:
         mkdir -p build
         cd build
         env \
-          CC=gcc-12 CXX=g++-12 FC=gfortran-12 \
+          CC=gcc-13 CXX=g++-12 FC=gfortran-12 \
           cmake -G Ninja \
           -DCMAKE_BUILD_TYPE=Release \
           -DUSE_${{ matrix.use_mpi }} \

diff --git a/cmake/CompilerConfiguration.cmake b/cmake/CompilerConfiguration.cmake
@@ -48,6 +48,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   if ((NOT (USE_MPI)) OR (NOT ("${MPI_Fortran_LIBRARY_VERSION_STRING}" MATCHES "Open MPI")))
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=leak")
   endif ()
+  if (USE_ACCEL MATCHES "hip" AND  hip_VERSION GREATER_EQUAL 6.0.0) # Remove deprecated function error with ROCm v6+
+     set(CMAKE_CXX_FLAGS            "${CMAKE_CXX_FLAGS} -Wno-error=deprecated-declarations")
+  endif	()
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
   set(CMAKE_CXX_FLAGS_RELEASE      "-O3 -funroll-loops")
   set(CMAKE_CXX_FLAGS_COVERAGE     "-O0 -g --coverage")