Merge pull request #58 from albertziegenhagel/etl-app

Improve ETL debugging tool app

.github/workflows/ci.yml

@@ -146,23 +146,35 @@ jobs:
 
       - name: Install
         run: |
-          cmake --install ${{ github.workspace }}/build/ci --component server --prefix ${{ github.workspace }}/install
+          cmake --install ${{ github.workspace }}/build/ci --component server --prefix ${{ github.workspace }}/install/server
+          cmake --install ${{ github.workspace }}/build/ci --component tools --prefix ${{ github.workspace }}/install/tools
 
-      - name: Add build info
+      - name: Create build info
         shell: pwsh
         run: |
           "ref:    ${{ github.ref_name }}`n" + `
           "commit: ${{ github.sha }}`n"  + `
-          "date:   $(Get-Date -UFormat '%FT%T%Z' -AsUTC)" | Out-File -Path "${{ github.workspace }}/install/bin/info.txt"
+          "date:   $(Get-Date -UFormat '%FT%T%Z' -AsUTC)" | Out-File -Path "${{ github.workspace }}/install/info.txt"
+          cp ${{ github.workspace }}/install/info.txt ${{ github.workspace }}/install/server/bin/
+          cp ${{ github.workspace }}/install/info.txt ${{ github.workspace }}/install/tools/bin/
 
-      - name: Upload binaries
-        uses: actions/upload-artifact@v3
+      - name: Upload server binaries
+        uses: actions/upload-artifact@v4
         if: runner.os != 'Linux' || matrix.compiler == 'gcc'
         with:
           name: snail-server-${{ matrix.arch }}-${{ matrix.platform }}
           path: |
-            ${{ github.workspace }}/install/bin/snail-server*
-            ${{ github.workspace }}/install/bin/info.txt
+            ${{ github.workspace }}/install/server/bin/snail-server*
+            ${{ github.workspace }}/install/server/bin/info.txt
+
+      - name: Upload tool binaries
+        uses: actions/upload-artifact@v4
+        if: runner.os != 'Linux' || matrix.compiler == 'gcc'
+        with:
+          name: snail-tools-${{ matrix.arch }}-${{ matrix.platform }}
+          path: |
+            ${{ github.workspace }}/install/tools/bin/app_*
+            ${{ github.workspace }}/install/tools/bin/info.txt
 
   deploy-head:
     name: "Deploy head"

.github/workflows/clang-format.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Run clang-format
       uses: DoozyX/[email protected]
       with:
-        source: './snail ./tests'
+        source: './snail ./tests ./apps'
         exclude: './snail/common/third_party'
         extensions: 'cpp,hpp'
         clangFormatVersion: 16

.github/workflows/test-data.yml

@@ -41,8 +41,8 @@ jobs:
       - name: Install Records
         run: ninja install-records
 
-      - name: Pack & Upload rests
-        uses: actions/upload-artifact@v3
+      - name: Pack & Upload results
+        uses: actions/upload-artifact@v4
         with:
           name: test-data-${{ matrix.run-on }}
           path: ${{ github.workspace }}/tests/apps/*/dist/**

CMakeLists.txt

@@ -17,6 +17,8 @@ include(CodeCoverage)
 option(BUILD_TESTING "Whether to build unit & integration tests" ON)
 cmake_dependent_option(SNAIL_ENABLE_CODE_COVERAGE "Enable code coverage for tests" OFF BUILD_TESTING OFF)
 
+option(SNAIL_BUILD_TOOLS "Whether to build some debugging tools" ON)
+
 option(SNAIL_WITH_LLVM "Required to resolve symbols from PDB and DWARF files." ON)
 
 option(SNAIL_ENABLE_SYSTEMTESTS "Whether to enable system testing" ON)
@@ -84,6 +86,11 @@ endif()
 
 add_subdirectory(snail)
 
+if(SNAIL_BUILD_TOOLS)
+  # Just for testing/development
+  add_subdirectory(apps)
+endif()
+
 # =======
 # Tests
 

CMakePresets.json

@@ -37,6 +37,10 @@
                 "SNAIL_ENABLE_CODE_COVERAGE": {
                     "type": "BOOL",
                     "value": "ON"
+                },
+                "SNAIL_BUILD_TOOLS": {
+                    "type": "BOOL",
+                    "value": "OFF"
                 }
             }
         }

apps/CMakeLists.txt

@@ -8,3 +8,13 @@ target_link_libraries(app_perf_data_file PRIVATE compile_options perf_data)
 
 add_executable(app_analysis analysis.cpp)
 target_link_libraries(app_analysis PRIVATE compile_options analysis)
+
+install(
+  TARGETS
+    app_etl_file
+    app_perf_data_file
+    app_analysis
+  COMPONENT
+    tools
+  RUNTIME DESTINATION bin
+)