dev 02

.clang-format

@@ -0,0 +1,7 @@
+BasedOnStyle: Google
+IndentWidth: 4
+TabWidth: 4
+AccessModifierOffset: -4
+ColumnLimit: 100
+AllowShortFunctionsOnASingleLine: Empty
+KeepEmptyLinesAtTheStartOfBlocks: false

.github/workflows/arch.yml.disabled

@@ -2,7 +2,7 @@ name: Arch Linux
 
 on:
   push:
-    branches: [main, master, dev]
+    branches: [main, master]
   pull_request:
     branches: [main, master]
 

.github/workflows/ci-full.yml

@@ -1,8 +1,9 @@
+---
 name: Full CI
 
 on:
   push:
-    branches: [main, master, dev]
+    branches: [main, master]
   pull_request:
     branches: [main, master]
 
@@ -21,7 +22,28 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y git cmake build-essential ccache \
           qtbase5-dev libqt5sql5-sqlite libgl1-mesa-dev \
-          clang-format cppcheck clang-tidy
+          clang-format cppcheck clang-tidy sqlite3
+
+      - name: Install LinuxDeploy
+        run: |
+          # LinuxDeploy
+          wget -q https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20251107-1/linuxdeploy-x86_64.AppImage
+          echo "c20cd71e3a4e3b80c3483cef793cda3f4e990aca14014d23c544ca3ce1270b4d  linuxdeploy-x86_64.AppImage" | sha256sum -c -
+
+          # Qt Plugin
+          wget -q https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/1-alpha-20250213-1/linuxdeploy-plugin-qt-x86_64.AppImage
+          echo "15106be885c1c48a021198e7e1e9a48ce9d02a86dd0a1848f00bdbf3c1c92724  linuxdeploy-plugin-qt-x86_64.AppImage" | sha256sum -c -
+
+          chmod +x linuxdeploy-x86_64.AppImage
+          chmod +x linuxdeploy-plugin-qt-x86_64.AppImage
+          sudo mv linuxdeploy-x86_64.AppImage /usr/local/bin/linuxdeploy
+          sudo mv linuxdeploy-plugin-qt-x86_64.AppImage /usr/local/bin/linuxdeploy-plugin-qt
+
+      - name: Build NTDB
+        run: make build-db
+
+      - name: Test NTDB
+        run: make test-db
 
       - name: Check Formatting
         run: |
@@ -33,8 +55,14 @@ jobs:
       - name: Lint
         run: make lint
 
-      - name: Build Release
-        run: make release
+      - name: Build AppImage
+        run: make appimage
 
       - name: Test
         run: make test
+
+      - name: Upload AppImage
+        uses: actions/upload-artifact@v4
+        with:
+          name: nutra-linux-appimage
+          path: build/*.AppImage

.github/workflows/macos.yml

@@ -1,8 +1,9 @@
+---
 name: macOS
 
 on:
   push:
-    branches: [main, master, dev]
+    branches: [main, master]
   pull_request:
     branches: [main, master]
 

.github/workflows/release.yml

@@ -0,0 +1,177 @@
+---
+name: Release Build
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  build-linux-20-04:
+    name: "Linux (Ubuntu 20.04)"
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y git cmake build-essential \
+            qtbase5-dev libqt5sql5-sqlite libgl1-mesa-dev
+
+      - name: Build
+        run: make release
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: nutra-linux-20.04
+          path: build/nutra
+
+  build-linux-22-04:
+    name: "Linux (Ubuntu 22.04)"
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y git cmake build-essential \
+            qt6-base-dev libqt6sql6 libqt6sql6-sqlite libgl1-mesa-dev
+
+      - name: Build
+        run: make release
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: nutra-linux-22.04
+          path: build/nutra
+
+  build-linux-24-04:
+    name: "Linux (Ubuntu 24.04)"
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y git cmake build-essential \
+            qt6-base-dev libqt6sql6 libqt6sql6-sqlite libgl1-mesa-dev
+
+      - name: Build
+        run: make release
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: nutra-linux-24.04
+          path: build/nutra
+
+  build-windows:
+    name: "Windows"
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: "6.5.0"
+          host: "windows"
+
+      - name: Build
+        run: make release
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: nutra-win64.exe
+          path: build/Release/nutra.exe
+
+  build-macos:
+    name: "macOS"
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: "6.5.0"
+          host: "mac"
+
+      - name: Build
+        run: make release
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: nutra-macos.app
+          path: build/nutra.app
+
+  release:
+    name: "Create Release"
+    needs:
+      [
+        build-linux-20-04,
+        build-linux-22-04,
+        build-linux-24-04,
+        build-windows,
+        build-macos,
+      ]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Verify tag is on master
+        run: |
+          git fetch origin master
+          if ! git merge-base --is-ancestor ${{ github.ref_name }} origin/master; then
+            echo "Error: Tag ${{ github.ref_name }} is not on master branch."
+            exit 1
+          fi
+
+      - name: Check for Pre-release
+        id: check_prerelease
+        run: |
+          if [[ "${{ github.ref_name }}" == *"-"* ]]; then
+            echo "is_prerelease=true" >> $GITHUB_OUTPUT
+            echo "Detected pre-release tag."
+          else
+            echo "is_prerelease=false" >> $GITHUB_OUTPUT
+            echo "Detected stable release tag."
+          fi
+
+      - name: Download Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          prerelease: ${{ steps.check_prerelease.outputs.is_prerelease }}
+          files: |
+            artifacts/nutra-linux-20.04/nutra
+            artifacts/nutra-linux-22.04/nutra
+            artifacts/nutra-linux-24.04/nutra
+            artifacts/nutra-win64.exe/nutra.exe
+            artifacts/nutra-macos.app/**
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ubuntu-20.04.yml

@@ -3,7 +3,7 @@ name: Ubuntu 20.04
 
 on:
   push:
-    branches: [main, master, dev]
+    branches: [main, master]
   pull_request:
     branches: [main, master]
 
@@ -23,7 +23,7 @@ jobs:
       - name: install dependencies
         run: |
           apt -y install git cmake build-essential ccache \
-            qtbase5-dev libqt5sql5-sqlite libgl1-mesa-dev
+            qtbase5-dev libqt5sql5-sqlite libgl1-mesa-dev sqlite3 python3
 
       - name: configure git
         run: git config --global --add safe.directory '*'
@@ -32,6 +32,12 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Build NTDB
+        run: make build-db
+
+      - name: Test NTDB
+        run: make test-db
+
       - name: Build Release
         run: make release
 

.github/workflows/ubuntu-22.04.yml

@@ -3,7 +3,7 @@ name: Ubuntu 22.04
 
 on:
   push:
-    branches: [main, master, dev]
+    branches: [main, master]
   pull_request:
     branches: [main, master]
 
@@ -13,6 +13,16 @@ jobs:
     runs-on: [self-hosted, ubuntu-22.04]
 
     steps:
+      # NOTE: issue resolved in CMakeLists.txt
+      # - name: Debug Environment
+      #   run: |
+      #     echo "User: $(whoami)"
+      #     echo "PWD: $(pwd)"
+      #     echo "CI env var: $CI"
+      #     ls -lah /usr/lib/x86_64-linux-gnu/libkeyutils.so* || echo "Not found in /usr/lib..."
+      #     ls -lah /lib/x86_64-linux-gnu/libkeyutils.so.1* || echo "Not found in /lib..."
+      #     /sbin/ldconfig -p | grep libkeyutils || echo "ldconfig failed"
+
       # NOTE: Dependencies are already installed on the dev runner
       # - name: update apt
       #   run: sudo apt-get update
@@ -26,6 +36,15 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Clean (between runs on VPS)
+        run: make clean
+
+      - name: Build NTDB
+        run: make build-db
+
+      - name: Test NTDB
+        run: make test-db
+
       - name: Build Release
         run: make release
 

.github/workflows/ubuntu-24.04.yml

@@ -3,7 +3,7 @@ name: Ubuntu 24.04
 
 on:
   push:
-    branches: [main, master, dev]
+    branches: [main, master]
   pull_request:
     branches: [main, master]
 
@@ -26,6 +26,12 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Build NTDB
+        run: make build-db
+
+      - name: Test NTDB
+        run: make test-db
+
       - name: Build Release
         run: make release