More releases and update test workflows

Author: Atraxus

.github/workflows/releaseDeploy.yml

@@ -13,10 +13,8 @@ jobs:
       matrix:
         include:
           - os: windows-latest
-            artifact-name: rayx-win64.zip
             build-type: Release
           - os: ubuntu-latest
-            artifact-name: rayx-Linux.deb
             build-type: Release
 
     steps:
@@ -72,6 +70,7 @@ jobs:
         if: matrix.os == 'windows-latest'
         run: cmake -B ${{github.workspace}}/build -DWERROR=YES -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DRAYX_REQUIRE_CUDA=ON
 
+      # Linux-specific build steps
       - name: Install dependencies (Ubuntu)
         if: matrix.os == 'ubuntu-latest'
         run: |
@@ -89,45 +88,69 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
         run: cmake -B ${{github.workspace}}/build -DWERROR=YES -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DRAYX_REQUIRE_CUDA=ON
 
+      # Build the project
       - name: Build
         run: cmake --build ${{github.workspace}}/build --config ${{ matrix.build-type }}
 
       - name: Test
         working-directory: ${{github.workspace}}/build/bin/release
         run: ./rayx-core-tst -x
 
-      - name: CPack (Windows)
+      # Generate Windows artifacts (ZIP and NSIS installer)
+      - name: CPack (Windows - ZIP)
         if: matrix.os == 'windows-latest'
         working-directory: ${{github.workspace}}/build
         run: cpack -G ZIP 
 
-      - name: CPack (Ubuntu)
+      - name: CPack (Windows - NSIS Installer)
+        if: matrix.os == 'windows-latest'
+        working-directory: ${{github.workspace}}/build
+        run: cpack -G NSIS
+
+      # Generate Linux artifacts (DEB, RPM, TAR)
+      - name: CPack (Ubuntu - DEB)
         if: matrix.os == 'ubuntu-latest'
         working-directory: ${{github.workspace}}/build
         run: cpack -G DEB
 
-      - name: Upload build artifact (Windows)
+      - name: CPack (Ubuntu - RPM)
+        if: matrix.os == 'ubuntu-latest'
+        working-directory: ${{github.workspace}}/build
+        run: cpack -G RPM
+
+      - name: CPack (Ubuntu - TAR)
+        if: matrix.os == 'ubuntu-latest'
+        working-directory: ${{github.workspace}}/build
+        run: cpack -G TGZ
+
+      # Upload artifacts (Windows)
+      - name: Upload build artifacts (Windows)
         if: matrix.os == 'windows-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.artifact-name }}
-          path: ${{github.workspace}}/build/RAYX-*-win64.zip
+          name: windows-artifacts
+          path: |
+            ${{github.workspace}}/build/RAYX-*.zip
+            ${{github.workspace}}/build/RAYX-*.exe
           if-no-files-found: error
-          
-      - name: Upload build artifact (Ubuntu)
+
+      # Upload artifacts (Ubuntu)
+      - name: Upload build artifacts (Ubuntu)
         if: matrix.os == 'ubuntu-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.artifact-name }}
-          path: ${{github.workspace}}/build/RAYX-*-Linux.deb
+          name: ubuntu-artifacts
+          path: |
+            ${{github.workspace}}/build/RAYX-*.deb
+            ${{github.workspace}}/build/RAYX-*.rpm
+            ${{github.workspace}}/build/RAYX-*.tar.gz
           if-no-files-found: error
 
   release:
     name: Create Release
     needs: build-and-release
     runs-on: ubuntu-latest
     steps:
-      # Checkout CHANGELOG.md
       - name: Checkout code
         uses: actions/checkout@v4
         with:
@@ -148,9 +171,10 @@ jobs:
         with:
           body_path: ${{github.workspace}}/CHANGELOG.md
           files: |
-            ${{github.workspace}}/artifacts/rayx-win64.zip/*.zip
-            ${{github.workspace}}/artifacts/rayx-Linux.deb/*.deb
+            ${{github.workspace}}/artifacts/windows-artifacts/*.zip
+            ${{github.workspace}}/artifacts/windows-artifacts/*.exe
+            ${{github.workspace}}/artifacts/ubuntu-artifacts/*.deb
+            ${{github.workspace}}/artifacts/ubuntu-artifacts/*.rpm
+            ${{github.workspace}}/artifacts/ubuntu-artifacts/*.tar.gz
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-

.github/workflows/testUbuntu.yml

@@ -1,12 +1,21 @@
 name: testUbuntu
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - '**'     # Run on all branches
+    tags-ignore:
+      - 'v*'     # Ignore tag pushes matching 'v*'
+  pull_request:
+    branches:
+      - '**'     # Run for all pull requests
 
 env:
   BUILD_TYPE: Release
 
 jobs:
   build:
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/testUbuntuClang.yml

@@ -1,12 +1,21 @@
 name: testUbuntuClang
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - '**'     # Run on all branches
+    tags-ignore:
+      - 'v*'     # Ignore tag pushes matching 'v*'
+  pull_request:
+    branches:
+      - '**'     # Run for all pull requests
 
 env:
   BUILD_TYPE: Release
 
 jobs:
   build:
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/testWindows.yml

@@ -1,12 +1,21 @@
 name: testWindows
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - '**'     # Run on all branches
+    tags-ignore:
+      - 'v*'     # Ignore tag pushes matching 'v*'
+  pull_request:
+    branches:
+      - '**'     # Run for all pull requests
 
 env:
   BUILD_TYPE: Release
 
 jobs:
   build:
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     runs-on: windows-latest
 
     steps:
@@ -35,10 +44,10 @@ jobs:
         uses: MarkusJx/[email protected]
         id: install-boost
         with:
-            boost_version: 1.84.0
-            boost_install_dir: ${{github.workspace}}/boost
-            platform_version: 2019
-            toolset: msvc
+          boost_version: 1.84.0
+          boost_install_dir: ${{github.workspace}}/boost
+          platform_version: 2019
+          toolset: msvc
 
       - name: Add Boost to PATH
         run: |
@@ -50,7 +59,7 @@ jobs:
         shell: pwsh
         run: .\Scripts\setup-cuda.ps1
         env:
-            INPUT_CUDA_VERSION: 12.5.1
+          INPUT_CUDA_VERSION: 12.5.1
 
       - name: Configure CMake
         run: cmake -B ${{github.workspace}}/build -DWERROR=YES -DRAYX_REQUIRE_CUDA=ON

CMakeLists.txt

@@ -1,34 +1,58 @@
 cmake_minimum_required(VERSION 3.25.2 FATAL_ERROR)
 
 # ---- Project ----
-project(RAYX VERSION 0.21.2)
+project(RAYX VERSION 0.21.21)
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CUDA_STANDARD 20)
 set(CMAKE_CUDA_STANDARD_REQUIRED ON)
-
 # ------------------
 
 # ---- Options ----
 option(WERROR "add -Werror option" "NO") # inactive per default
 option(RAYX_ENABLE_CUDA "This option enables the search for CUDA. Project will be compiled without cuda if not found." ON)
 option(RAYX_REQUIRE_CUDA "If option 'RAYX_ENABLE_CUDA' is ON, this option will add the requirement that cuda must be found." OFF)
-
 # ------------------
 
-# ---- Subdirectories ----
-add_subdirectory(Extern)
-add_subdirectory(Intern)
-
 # ---- Code Coverage ----
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/Extern/cmake)
-
 # ------------------
 
 # ---- CPack ----
 set(CPACK_PROJECT_NAME ${PROJECT_NAME})
-set(CPACK_PROJECT_VERSION ${PROJECT_VERSION})
-set(CPACK_PACKAGE_VENDOR "RAYX")
-set(CPACK_PACKAGE_CONTACT "Max Mustermann <" ${PROJECT_NAME} "@helmholtz-berlin.de>")
-include(CPack)
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
+set(CPACK_PACKAGE_DESCRIPTION "${PROJECT_NAME} - For simulating and designing beamlines at synchrotron light sources")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME} - For simulating and designing beamlines at synchrotron light sources")
+set(CPACK_PACKAGE_VENDOR "Helmhotz-Zentrum Berlin")
+set(CPACK_PACKAGE_CONTACT "[email protected]")
+
+# Disable GoogleTest installation
+set(INSTALL_GTEST OFF CACHE BOOL "Disable installation of GoogleTest" FORCE)
+set(INSTALL_GMOCK OFF CACHE BOOL "Disable installation of GoogleMock" FORCE)
+
+if(APPLE)
+    set(CMAKE_INSTALL_PREFIX "/Applications/${PROJECT_NAME}")
+    set(CPACK_PACKAGE_INSTALL_DIRECTORY "/Applications/${PROJECT_NAME}")
+    # macOS destinations
+    set(INSTALL_DATA_DIR "/Library/Application Support/${PROJECT_NAME}")
+    set(INSTALL_FONTS_DIR "/Library/Fonts/${PROJECT_NAME}")
+elseif(UNIX AND NOT APPLE)
+    set(CMAKE_INSTALL_PREFIX "/usr/local")
+    set(CPACK_PACKAGE_INSTALL_DIRECTORY "/usr/local")
+    # Linux destinations
+    set(INSTALL_DATA_DIR "/usr/local/share/${PROJECT_NAME}")
+    set(INSTALL_FONTS_DIR "/usr/local/share/fonts/${PROJECT_NAME}")
+elseif(WIN32)
+    set(CMAKE_INSTALL_PREFIX "${PROJECT_NAME}")
+    set(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}")
+    # Windows destinations (inside ProgramData or another appropriate directory)
+    set(INSTALL_DATA_DIR "ProgramData/${PROJECT_NAME}")
+    set(INSTALL_FONTS_DIR "Windows/Fonts/${PROJECT_NAME}")
+endif()
 # ------------------
+
+
+# ---- Subdirectories ----
+add_subdirectory(Extern)
+add_subdirectory(Intern)
+# ------------------

Intern/rayx-core/CMakeLists.txt

@@ -60,12 +60,6 @@ file(GLOB_RECURSE ALPAKA_SOURCE
 add_library(${PROJECT_NAME} SHARED ${SOURCE})
 alpaka_target(${PROJECT_NAME})
 alpaka_source(${ALPAKA_SOURCE})
-
-install(TARGETS ${PROJECT_NAME}
-    RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib/static)
-
 # -----------------
 
 # -----OpenMP--------
@@ -214,12 +208,17 @@ add_custom_command(
 # -----------------
 
 # ---- CPack ----
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
-set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
-set(CPACK_PACKAGE_CONTACT "Your Name <[email protected]>")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Your Project Description")
-install(FILES ${SCRIPT_SRC_DIR} DESTINATION bin/Scripts)
-
+install(TARGETS ${PROJECT_NAME} 
+    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+    LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+)
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data
+        DESTINATION ${INSTALL_DATA_DIR}
+        FILES_MATCHING PATTERN "*")
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/Scripts
+        DESTINATION ${INSTALL_DATA_DIR}
+        FILES_MATCHING PATTERN "*")
+include(InstallRequiredSystemLibraries)
 include(CPack)
-
 # -----------------

Intern/rayx-core/src/Beamline/Objects/CircleSource.h

@@ -15,7 +15,7 @@ class RAYX_API CircleSource : public LightSource {
 
   private:
     // Geometric Params
-    SourcePulseType m_sourceDistributionType;  // TODO unused.
+    // SourcePulseType m_sourceDistributionType;  // TODO unused.
     Misalignment m_misalignment;
 
     glm::dvec4 m_stokes;

Intern/rayx-core/src/Beamline/Objects/MatrixSource.h

@@ -13,7 +13,7 @@ class RAYX_API MatrixSource : public LightSource {
     virtual std::vector<Ray> getRays(int thread_count = 1) const override;
 
   private:
-    SourcePulseType m_sourceDistributionType;  // TODO: wo muss der name angepasst werden?
+    // SourcePulseType m_sourceDistributionType;  // TODO: wo muss der name angepasst werden?
 
     glm::dvec4 m_pol;
 

Intern/rayx-core/src/Beamline/Objects/PixelSource.h

@@ -13,7 +13,7 @@ class RAYX_API PixelSource : public LightSource {
 
   private:
     // Geometric Params
-    SourcePulseType m_sourceDistributionType;  // TODO unused.
+    // SourcePulseType m_sourceDistributionType;  // TODO unused.
 
     glm::dvec4 m_pol;
 

Intern/rayx-core/src/Beamline/Objects/PointSource.h

@@ -20,7 +20,7 @@ class RAYX_API PointSource : public LightSource {
     SourceDist m_heightDist;
     SourceDist m_horDist;
     SourceDist m_verDist;
-    SourcePulseType m_sourceDistributionType;  // TODO unused.
+    // SourcePulseType m_sourceDistributionType;  // TODO unused.
 
     glm::dvec4 m_pol;