Pawel plesniak/fsm interface to fsm action

.github/workflows/dunedaq-develop-cpp-ci.yml

@@ -14,23 +14,21 @@ on:
   pull_request:
     branches: [ develop ]
   schedule:
-    - cron: "0 7 * * *"
+    - cron: "0 9 * * *"
 
   workflow_dispatch:
 
 
 jobs:
-  Spack_Build_against_dev_release:
-    name: spack_build_against_dev_on_${{ matrix.os_name }}
+  Build_against_dev_release:
+    name: build_against_dev_on_${{ matrix.os_name }}
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
     strategy:
       matrix:
         include:
-          - image: "ghcr.io/dune-daq/sl7-slim-externals:spack-dev"
-            os_name: "c7"
-          - image: "ghcr.io/dune-daq/c8-slim-externals:spack-dev"
-            os_name: "c8"
+          - image: "ghcr.io/dune-daq/nightly-release-alma9:development_v5"
+            os_name: "a9"
     container:
       image: ${{ matrix.image }}
     defaults:
@@ -49,42 +47,44 @@ jobs:
 
     - name: setup dev area
       run: |
+          export REPO=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')
           source /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh
-          setup_dbt latest|| true
-          dbt-create -n last_successful dev-${{ matrix.os_name }}
-
+          setup_dbt latest || true
+          release_name="last_fddaq"
+
+          if [[ -n $( sed -r -n '/- name: '$REPO'$/p' daq-release/configs/nddaq/nddaq-develop/release.yaml ) ]] ; then release_name="last_nddaq"; fi
+
+          dbt-create -n $release_name dev-${{ matrix.os_name }}
+
     - name: checkout package for CI
       uses: actions/checkout@v3
       with:
         path: ${{ github.repository }}
 
     - name: setup build env, build the repo against the development release
-      #- name: setup build env, build and lint the repo against the development release
       run: |
           export REPO=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')
           cd $GITHUB_WORKSPACE/dev-${{ matrix.os_name }}
           source env.sh || true
-          spack unload $REPO
+          test $REPO == "dbe" && spack load dbe || true
+          spack unload $REPO || true
           cp -pr $GITHUB_WORKSPACE/DUNE-DAQ/$REPO $GITHUB_WORKSPACE/dev-${{ matrix.os_name }}/sourcecode
-          dbt-build
-          #[[ $REPO == "daq-cmake" ]] && dbt-build || dbt-build --lint
-          dbt-workarea-env
-          #dbt-build --unittest
+          dbt-build # --unittest # --lint
 
     - name: upload build log file
       uses: actions/upload-artifact@v3
       with:
-        name: spack_build_log_${{ matrix.os_name }}
+        name: build_log_${{ matrix.os_name }}
         path: ${{ github.workspace }}/dev-${{ matrix.os_name }}/log/build*.log
 
-          #- name: upload linter output file
-          #uses: actions/upload-artifact@v3
-          #with:
-          #name: spack_linting_log_${{ matrix.os_name }}
-          #path: ${{ github.workspace }}/dev-${{ matrix.os_name }}/log/linting*
+    # - name: upload linter output file
+    #   uses: actions/upload-artifact@v3
+    #   with:
+    #     name: linting_log_${{ matrix.os_name }}
+    #     path: ${{ github.workspace }}/dev-${{ matrix.os_name }}/log/linting*
 
-          #- name: upload unittest output file
-          #uses: actions/upload-artifact@v2
-          #with:
-          #name: spack_unit_tests_log_${{ matrix.os_name }}
-          #path: ${{ github.workspace }}/dev-${{ matrix.os_name }}/log/unit_tests*
+    # - name: upload unittest output file
+    #   uses: actions/upload-artifact@v3
+    #   with:
+    #     name: unit_tests_log_${{ matrix.os_name }}
+    #     path: ${{ github.workspace }}/dev-${{ matrix.os_name }}/log/unit_tests*

CMakeLists.txt

@@ -1,22 +1,26 @@
 cmake_minimum_required(VERSION 3.12)
-project(listrev VERSION 3.3.0)
+project(listrev VERSION 4.0.1)
 
 find_package(daq-cmake REQUIRED )
 
 daq_setup_environment()
 
-find_package(rcif REQUIRED)
 find_package(appfwk REQUIRED)
 find_package(opmonlib REQUIRED)
-find_package(logging REQUIRED)
-find_package(daqconf REQUIRED)
-find_package(ers REQUIRED)
 
-daq_codegen( randomdatalistgenerator.jsonnet TEMPLATES Structs.hpp.j2 Nljs.hpp.j2)
-daq_codegen( randomdatalistgeneratorinfo.jsonnet DEP_PKGS opmonlib TEMPLATES opmonlib/InfoStructs.hpp.j2 opmonlib/InfoNljs.hpp.j2 )
+find_package(genconfig REQUIRED)
+find_package(coredal REQUIRED)
 
-daq_add_plugin(ListReverser duneDAQModule	     LINK_LIBRARIES appfwk::appfwk)
-daq_add_plugin(RandomDataListGenerator duneDAQModule LINK_LIBRARIES appfwk::appfwk)
-daq_add_plugin(ReversedListValidator duneDAQModule   LINK_LIBRARIES appfwk::appfwk)
+daq_oks_codegen(listrev.schema.xml NAMESPACE dunedaq::listrev::dal DALDIR dal DEP_PKGS coredal)
+
+
+daq_codegen( listreverser.jsonnet randomdatalistgenerator.jsonnet reversedlistvalidator.jsonnet TEMPLATES Structs.hpp.j2 Nljs.hpp.j2)
+daq_codegen( listreverserinfo.jsonnet randomdatalistgeneratorinfo.jsonnet reversedlistvalidatorinfo.jsonnet DEP_PKGS opmonlib TEMPLATES opmonlib/InfoStructs.hpp.j2 opmonlib/InfoNljs.hpp.j2 )
+
+daq_add_library(ListCreator.cpp ListStorage.cpp LINK_LIBRARIES  appfwk::appfwk coredal::coredal)
+
+daq_add_plugin(ListReverser            duneDAQModule LINK_LIBRARIES listrev)
+daq_add_plugin(RandomDataListGenerator duneDAQModule LINK_LIBRARIES listrev)
+daq_add_plugin(ReversedListValidator   duneDAQModule LINK_LIBRARIES listrev)
 
 daq_install()

cmake/listrevConfig.cmake.in

@@ -5,9 +5,6 @@ include(CMakeFindDependencyMacro)
 
 find_dependency(opmonlib)
 find_dependency(appfwk)
-find_dependency(rcif)
-find_dependency(logging)
-find_dependency(ers)
 
 # Figure out whether or not this dependency is an installed package or
 # in repo form