From b059872f507b61b0eb6b851e012a8e6b7c05d74c Mon Sep 17 00:00:00 2001 From: dustinswales Date: Fri, 17 Jan 2025 14:42:00 -0700 Subject: [PATCH] Turn off some CI tests --- .../workflows/ci_build_scm_ubuntu_22.04.yml | 3 ++- .github/workflows/ci_run_scm_DEPHY.yml | 3 ++- .github/workflows/ci_scm_ccpp_prebuild.yml | 3 ++- .github/workflows/ci_test_docker.yml | 3 ++- scm/src/CMakeLists.txt | 25 ------------------- 5 files changed, 8 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04.yml b/.github/workflows/ci_build_scm_ubuntu_22.04.yml index 115b5836f..8ec522153 100644 --- a/.github/workflows/ci_build_scm_ubuntu_22.04.yml +++ b/.github/workflows/ci_build_scm_ubuntu_22.04.yml @@ -1,6 +1,7 @@ name: CI test to build the CCPP-SCM on ubuntu v22.04 -on: [pull_request,workflow_dispatch] +#on: [pull_request,workflow_dispatch] +on: [workflow_dispatch] jobs: build_scm: diff --git a/.github/workflows/ci_run_scm_DEPHY.yml b/.github/workflows/ci_run_scm_DEPHY.yml index 52a9993e4..10e8ce45f 100644 --- a/.github/workflows/ci_run_scm_DEPHY.yml +++ b/.github/workflows/ci_run_scm_DEPHY.yml @@ -1,6 +1,7 @@ name: CI test to run the SCM with DEPHY v1 data -on: [pull_request,workflow_dispatch] +#on: [pull_request,workflow_dispatch] +on: [workflow_dispatch] jobs: run-scm-DEPHY: diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml index 662aa267c..484760c70 100644 --- a/.github/workflows/ci_scm_ccpp_prebuild.yml +++ b/.github/workflows/ci_scm_ccpp_prebuild.yml @@ -1,7 +1,8 @@ # CI test to run SCM ccpp_prebuild script name: build -on: [push, pull_request, workflow_dispatch] +#on: [push, pull_request, workflow_dispatch] +on: [workflow_dispatch] jobs: build-linux: diff --git a/.github/workflows/ci_test_docker.yml b/.github/workflows/ci_test_docker.yml index 55ab78b26..b12540f54 100644 --- a/.github/workflows/ci_test_docker.yml +++ b/.github/workflows/ci_test_docker.yml @@ -1,6 +1,7 @@ name: build_test_and_push_docker -on: [pull_request,workflow_dispatch] +#on: [pull_request,workflow_dispatch] +on: [workflow_dispatch] env: TEST_TAG: dtcenter/ccpp-scm:test diff --git a/scm/src/CMakeLists.txt b/scm/src/CMakeLists.txt index 22e2b5fcd..692fec00e 100644 --- a/scm/src/CMakeLists.txt +++ b/scm/src/CMakeLists.txt @@ -57,31 +57,6 @@ SET(CCPP_CAP_FILES "${CMAKE_BINARY_DIR}/ccpp" CACHE SET(CCPP_FRAMEWORK ${CCPP_ROOT}/ccpp/framework/scripts) -if (${CMAKE_Fortran_COMPILER_ID} MATCHES "GNU") - MESSAGE(STATUS "gfortran being used.") - ADD_COMPILE_OPTIONS(-ggdb) - ADD_COMPILE_OPTIONS(-fbacktrace) - ADD_COMPILE_OPTIONS(-cpp) - ADD_COMPILE_OPTIONS(-fcray-pointer) - ADD_COMPILE_OPTIONS(-ffree-line-length-none) - ADD_COMPILE_OPTIONS(-fno-range-check) -elseif (${CMAKE_Fortran_COMPILER_ID} MATCHES "Intel") - MESSAGE(STATUS "ifort being used.") - ADD_COMPILE_OPTIONS(-traceback) - ADD_COMPILE_OPTIONS(-fpp) - ADD_COMPILE_OPTIONS(-g) - ADD_COMPILE_OPTIONS(-fno-alias) - ADD_COMPILE_OPTIONS(-auto) - ADD_COMPILE_OPTIONS(-safe-cray-ptr) - ADD_COMPILE_OPTIONS(-ftz) - ADD_COMPILE_OPTIONS(-assume byterecl) - ADD_COMPILE_OPTIONS(-nowarn) - ADD_COMPILE_OPTIONS(-sox) - ADD_COMPILE_OPTIONS(-align) -else (${CMAKE_Fortran_COMPILER_ID} MATCHES "GNU") - message (WARNING "This program has only been compiled with gfortran and ifort. If another compiler is needed, the appropriate flags SHOULD be added in ${CMAKE_SOURCE_DIR}/CMakeLists.txt") -endif (${CMAKE_Fortran_COMPILER_ID} MATCHES "GNU") - #------------------------------------------------------------------------------ # CMake Modules # Set the CMake module path