linux first step - make tests run

Author: aloneguid

.github/workflows/build.yml

@@ -4,16 +4,17 @@ env:
   VERSION: 3.3.1
   BUILD_TYPE: Release
   ARCH: x64
-  VCPKG_DEFAULT_VCPKG_TRIPLET: x64-windows-static
-  VCPKG_TRIPLET: x64-windows-static
   VCPKG_CONFIG: Release
 
 on: [push, workflow_dispatch]
 
 jobs:
-  build:
+  build-win:
     runs-on: windows-latest 
-    name: 'build'
+    name: 'Windows Build'
+    env:
+      VCPKG_DEFAULT_VCPKG_TRIPLET: x64-windows-static
+      VCPKG_TRIPLET: x64-windows-static
 
     steps:
 
@@ -75,5 +76,30 @@ jobs:
         name: bin
         path: atf/*
 
+  build-linux:
+    runs-on: ubuntu-latest
+    name: 'Linux Build'
+    env:
+      VCPKG_DEFAULT_VCPKG_TRIPLET: x64-linux
+      VCPKG_TRIPLET: x64-linux
 
+    steps:
+      
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+
+    - uses: friendlyanon/setup-vcpkg@v1
+      # seems like the absense of commit hash expects vcpkg submodule, i don't want that
+      with:
+        committish: 5269f4f4f6b3970ad21f6956f6bb2322c024910c 
+        # set to false to clear any cache in case of build errors
+        cache: false
 
+    - name: ⚙️ configure
+      run: >
+        cmake -B build -S .
+        -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+        -D "CMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake"
+        -D "VCPKG_TARGET_TRIPLET=${{ env.VCPKG_TRIPLET }}"
+      working-directory: . 

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.20)
+cmake_minimum_required (VERSION 3.19)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
@@ -16,6 +16,8 @@ add_compile_definitions(UNICODE) # required for WIN32 API to use correct version
 # see https://cmake.org/cmake/help/latest/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
-add_subdirectory(grey)
-add_subdirectory(bt)
+if(WIN32)
+    add_subdirectory(grey)
+    add_subdirectory(bt)
+endif()
 add_subdirectory(test)

CMakePresets.json

@@ -41,6 +41,31 @@
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Release"
             }
+        },
+        {
+            "name": "linux-debug",
+            "displayName": "Linux Debug",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/out/build/${presetName}",
+            "installDir": "${sourceDir}/out/install/${presetName}",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+                "CMAKE_TOOLCHAIN_FILE": {
+                    "value": "$env{HOME}/vcpkg/scripts/buildsystems/vcpkg.cmake",
+                    "type": "FILEPATH"
+                }
+
+            },
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Linux"
+            },
+            "vendor": {
+                "microsoft.com/VisualStudioRemoteSettings/CMake/1.0": {
+                    "sourceDir": "$env{HOME}/.vs/$ms{projectDirName}"
+                }
+            }
         }
     ]
 }

bt/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.20)
+cmake_minimum_required (VERSION 3.19)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 

bt/app/match_rule.cpp

@@ -26,8 +26,6 @@ namespace bt {
                     priority = str::to_int(v);
                 } else if(k == "mode") {
                     if(v == "app") app_mode = true;
-                } else if(k == "firefox_container") {
-                    firefox_container = v;
                 } else if(k == "type") {
                     if(v == "regex") is_regex = true;
                 }
@@ -74,10 +72,6 @@ namespace bt {
             parts.push_back("type:regex");
         }
 
-        if(!firefox_container.empty()) {
-            parts.push_back(fmt::format("firefox_container:{}", firefox_container));
-        }
-
         parts.push_back(s);
 
         return str::join(parts.begin(), parts.end(), "|");

bt/app/match_rule.h

@@ -20,7 +20,6 @@ namespace bt {
         int priority{0};
         bool is_regex{false};
         bool app_mode{false};
-        std::string firefox_container;
 
         bool operator==(const match_rule& other) const;
 

docs/release-notes.md

@@ -1,3 +1,7 @@
+## 3.x
+
+
+
 ## 3.3.1
 
 - Rule hits can can be optionally recorded to a CSV file (off by default). To enable, check `Settings`->`Log Rule Hits to File`. This creates `hit_log.csv` which you can open from the `File` menu. Feature is useful for recording your activity for further analysis to exporting to some analytical engine.

test/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.20)
+cmake_minimum_required (VERSION 3.19)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 

vcpkg.json

@@ -11,6 +11,19 @@
             ],
             "platform": "windows"
         },
+        {
+            "name": "imgui",
+            "features": [
+                "opengl3-binding",
+                "sdl2-binding",
+                "docking-experimental"
+            ],
+            "platform": "linux"
+        },
+        {
+            "name": "opengl",
+            "platform": "linux"
+        },
         "implot",
         "fmt",
         "nlohmann-json",