Remove commented lines in workflow file

- List CMake options one per line Re ECFLOW-1967
ecmwf · Nov 14, 2024 · c2cc15e · c2cc15e
1 parent 6abdd1a
commit c2cc15e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/.github/cd-server-config.yml b/.github/cd-server-config.yml
@@ -1,8 +1,15 @@
 cmake_options: >-
-  -DBOOST_ROOT=${BOOST_ROOT_DIR} -DBOOST_INCLUDEDIR=${BOOST_INCLUDE_DIR} -DBOOST_LIBRARYDIR=${BOOST_LIB_DIR}
-  -DBoost_DEBUG=ON -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -DENABLE_STATIC_BOOST_LIBS=OFF
+  -DBOOST_ROOT=${BOOST_ROOT_DIR}
+  -DBOOST_INCLUDEDIR=${BOOST_INCLUDE_DIR}
+  -DBOOST_LIBRARYDIR=${BOOST_LIB_DIR}
+  -DBoost_DEBUG=ON 
+  -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}
+  -DENABLE_STATIC_BOOST_LIBS=OFF
   -DINSTALL_PYTHON3_DIR=lib/python3/dist-packages
-  -DENABLE_ALL_TESTS=ON -DENABLE_SSL=ON -DENABLE_SERVER=ON -DENABLE_UI=OFF
+  -DENABLE_ALL_TESTS=ON
+  -DENABLE_SSL=ON
+  -DENABLE_SERVER=ON
+  -DENABLE_UI=OFF
   -DCPACK_PACKAGE_NAME=ecflow
 ctest_options: -L nightly -E s_test|s_zombies
 dependencies: |

diff --git a/.github/cd-ui-config.yml b/.github/cd-ui-config.yml
@@ -1,9 +1,19 @@
 cmake_options: >-
-  -DBOOST_ROOT=${BOOST_ROOT_DIR} -DBOOST_INCLUDEDIR=${BOOST_INCLUDE_DIR} -DBOOST_LIBRARYDIR=${BOOST_LIB_DIR}
-  -DBoost_DEBUG=ON -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -DENABLE_STATIC_BOOST_LIBS=OFF
+  -DBOOST_ROOT=${BOOST_ROOT_DIR} 
+  -DBOOST_INCLUDEDIR=${BOOST_INCLUDE_DIR} 
+  -DBOOST_LIBRARYDIR=${BOOST_LIB_DIR}
+  -DBoost_DEBUG=ON 
+  -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} 
+  -DENABLE_STATIC_BOOST_LIBS=OFF
   -DINSTALL_PYTHON3_DIR=lib/python3/dist-packages
-  -DENABLE_ALL_TESTS=ON -DENABLE_SSL=ON -DENABLE_SERVER=OFF -DENABLE_HTTP=OFF -DENABLE_UDP=OFF -DENABLE_PYTHON=OFF
-  -DENABLE_UI=ON -DUI_SYSTEM_SERVERS_LIST=/ec/vol/ecflow_def/servers.list.all
+  -DENABLE_ALL_TESTS=ON 
+  -DENABLE_SSL=ON 
+  -DENABLE_SERVER=OFF 
+  -DENABLE_HTTP=OFF 
+  -DENABLE_UDP=OFF 
+  -DENABLE_PYTHON=OFF
+  -DENABLE_UI=ON 
+  -DUI_SYSTEM_SERVERS_LIST=/ec/vol/ecflow_def/servers.list.all
   -DCPACK_PACKAGE_NAME=ecflow-ui
 ctest_options: -L nightly -E s_test|s_zombies
 dependencies: |

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -2,9 +2,7 @@ name: cd
 
 on:
   push: ~
-  #push:
-  #  tags:
-  #    - '[0-9]+.[0-9]+.[0-9]+'
+
   # Trigger the workflow manually
   workflow_dispatch: ~
 
@@ -22,7 +20,5 @@ jobs:
     with:
       skip_checks: true
       restrict_matrix_jobs: [email protected]
-      #restrict_matrix_jobs: gnu@debian-12
       build_config: .github/cd-ui-config.yml
-      #cpack_options: -DCPACK_PACKAGE_NAME=ecflow-ui
     secrets: inherit