Merge changes from 'hotfix/5.13.6' into develop

As part of resolving conflicts:
 - TestNaming.hpp was removed to ecflow/test/scaffold/Naming.hpp
 - test_scaffold effectively replaced test_support

.github/cd-server-config.yml

@@ -0,0 +1,18 @@
+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
+  -DINSTALL_PYTHON3_DIR=lib/python3/dist-packages
+  -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: |
+  ecmwf/ecbuild
+dependency_branch: develop
+parallelism_factor: 8

.github/cd-ui-config.yml

@@ -0,0 +1,22 @@
+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
+  -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
+  -DCPACK_PACKAGE_NAME=ecflow-ui
+ctest_options: -L nightly -E s_test|s_zombies
+dependencies: |
+  ecmwf/ecbuild
+dependency_branch: develop
+parallelism_factor: 8

.github/workflows/cd.yml

@@ -0,0 +1,31 @@
+name: cd
+
+on:
+  # Trigger the workflow manually
+  workflow_dispatch: ~
+
+  push:
+    # Trigger the workflow when new tags are pushed
+    tags:
+      - '**'
+    # Trigger the workflow when the CD workflow/configuration is updated
+    paths:
+      - .github/cd-*.yml
+      - .github/workflows/cd.yml
+
+jobs:
+  deploy-server:
+    uses: ecmwf-actions/reusable-workflows/.github/workflows/create-package.yml@v2
+    with:
+      skip_checks: true
+      restrict_matrix_jobs: gnu@debian-12
+      build_config: .github/cd-server-config.yml
+    secrets: inherit
+
+  deploy-ui:
+    uses: ecmwf-actions/reusable-workflows/.github/workflows/create-package.yml@v2
+    with:
+      skip_checks: true
+      restrict_matrix_jobs: [email protected]
+      build_config: .github/cd-ui-config.yml
+    secrets: inherit

CMakeLists.txt

@@ -31,7 +31,7 @@ find_package( ecbuild 3.4 REQUIRED HINTS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CUR
 # Project
 # =========================================================================================
 
-project( ecflow LANGUAGES CXX VERSION 5.13.5 )
+project( ecflow LANGUAGES CXX VERSION 5.13.6 )
 #
 # Important:
 #   The CMake project version is used, as generated CMake variables, to filter .../ecflow/core/ecflow_version.h.in

Viewer/ecflowUI/src/NodeViewDelegate.cpp

@@ -1699,7 +1699,7 @@ void NodeViewDelegate::renderRepeat(QPainter* painter,
 
     size = QSize(totalWidth, attrBox_->fullHeight);
 
-    if (data.count() < 9)
+    if (data.count() < 10)
         return;
 
     QString type = data.at(1);
@@ -1708,8 +1708,9 @@ void NodeViewDelegate::renderRepeat(QPainter* painter,
     QString step = data.at(6);
     QString pos  = data.at(8);
 
-    if (data.count() == 10)
-        name.prepend(data[9] + ":");
+    if (data.count() == 11) {
+        name.prepend(data[10] + ":");
+    }
 
     bool selected = option.state & QStyle::State_Selected;
 

Viewer/ecflowUI/src/RepeatEditor.cpp

@@ -369,8 +369,65 @@ void RepeatDateEditor::apply() {
     CommandHandler::run(info_, cmd);
 }
 
+//================================================================
+//
+// RepeatDateTimeEditor
+//
+//================================================================
+
+RepeatDateTimeEditor::RepeatDateTimeEditor(VInfo_ptr info, QWidget* parent) : RepeatEditor(info, parent) {
+    // if(!repeat_)
+    //     return;
+
+    w_->hideRow(w_->valueSpin_);
+    w_->valueLe_->setText(oriVal_);
+
+    connect(w_->valueLe_, SIGNAL(textEdited(QString)), this, SLOT(slotValueEdited(QString)));
+
+    checkButtonStatus();
+}
+
+void RepeatDateTimeEditor::setValue(QString val) {
+    w_->valueLe_->setText(val);
+}
+
+void RepeatDateTimeEditor::slotValueEdited(QString txt) {
+    if (isListMode()) {
+        int row = modelData_.indexOf(txt);
+        if (row != -1) {
+            w_->valueView_->setCurrentIndex(model_->index(row, 0));
+        }
+        else {
+            w_->valueView_->clearSelection();
+            w_->valueView_->setCurrentIndex(QModelIndex());
+        }
+    }
+    checkButtonStatus();
+}
+
+void RepeatDateTimeEditor::resetValue() {
+    w_->valueLe_->setText(oriVal_);
+    slotValueEdited(oriVal_);
+    checkButtonStatus();
+}
+
+bool RepeatDateTimeEditor::isValueChanged() {
+    return (oriVal_ != w_->valueLe_->text());
+}
+
+void RepeatDateTimeEditor::apply() {
+    std::string val = w_->valueLe_->text().toStdString();
+    // std::string name=w_->nameLabel_->text().toStdString();
+
+    std::vector<std::string> cmd;
+    VAttribute::buildAlterCommand(cmd, "change", "repeat", val);
+    CommandHandler::run(info_, cmd);
+}
+
+
 static AttributeEditorMaker<RepeatIntEditor> makerStr1("repeat_integer");
 static AttributeEditorMaker<RepeatStringEditor> makerStr2("repeat_string");
 static AttributeEditorMaker<RepeatStringEditor> makerStr3("repeat_enumerated");
 static AttributeEditorMaker<RepeatDateEditor> makerStr4("repeat_date");
 static AttributeEditorMaker<RepeatStringEditor> makerStr5("repeat_datelist");
+static AttributeEditorMaker<RepeatDateTimeEditor> makerStr6("repeat_datetime");

Viewer/ecflowUI/src/RepeatEditor.hpp

@@ -27,6 +27,7 @@ class RepeatEditorWidget : public QWidget, protected Ui::RepeatEditorWidget {
     friend class RepeatIntEditor;
     friend class RepeatStringEditor;
     friend class RepeatDateEditor;
+    friend class RepeatDateTimeEditor;
 
 public:
     explicit RepeatEditorWidget(QWidget* parent = nullptr);
@@ -105,4 +106,19 @@ protected Q_SLOTS:
     bool isValueChanged() override;
 };
 
+class RepeatDateTimeEditor : public RepeatEditor {
+    Q_OBJECT
+public:
+    explicit RepeatDateTimeEditor(VInfo_ptr, QWidget* parent = nullptr);
+
+protected Q_SLOTS:
+    void slotValueEdited(QString);
+
+protected:
+    void apply() override;
+    void setValue(QString val) override;
+    void resetValue() override;
+    bool isValueChanged() override;
+};
+
 #endif /* ecflow_viewer_RepeatEditor_HPP */