fix CI scripts

Author: avsej

.github/workflows/linters.yml

@@ -48,7 +48,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y libssl-dev cmake curl wget gnupg2 libcurl4-openssl-dev libprotobuf-dev libgrpc-dev gdb
+          sudo apt-get install -y libssl-dev cmake curl wget gnupg2 libcurl4-openssl-dev libprotobuf-dev libgrpc-dev gdb protobuf-compiler
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo gpg --dearmor --output /etc/apt/keyrings/llvm-snapshot.gpg
           sudo bash -c "echo 'deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg] https://apt.llvm.org/noble/ llvm-toolchain-noble-${LLVM_VERSION} main' >> /etc/apt/sources.list"
           sudo apt-get update -y
@@ -75,7 +75,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y libssl-dev cmake curl wget gnupg2 clang clang-tools cppcheck libcurl4-openssl-dev libprotobuf-dev libgrpc-dev gdb
+          sudo apt-get install -y libssl-dev cmake curl wget gnupg2 clang clang-tools cppcheck libcurl4-openssl-dev libprotobuf-dev libgrpc-dev gdb protobuf-compiler
       - name: Run cppcheck
         run: ./bin/check-cppcheck
 
@@ -88,7 +88,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y libssl-dev cmake curl wget gnupg2 clang clang-tools clang-tidy libcurl4-openssl-dev libprotobuf-dev libgrpc-dev gdb
+          sudo apt-get install -y libssl-dev cmake curl wget gnupg2 clang clang-tools clang-tidy libcurl4-openssl-dev libprotobuf-dev libgrpc-dev gdb protobuf-compiler
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo gpg --dearmor --output /etc/apt/keyrings/llvm-snapshot.gpg
           sudo bash -c "echo 'deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg] https://apt.llvm.org/noble/ llvm-toolchain-noble-${LLVM_VERSION} main' >> /etc/apt/sources.list"
           sudo apt-get update -y

bin/validate-test-labels

@@ -1,52 +1,50 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require 'find'
-require 'set'
+require "find"
 
-ALLOWED_LABELS = [
-    'unit',
-    'integration',
-    'benchmark',
-    'transactions',
+ALLOWED_LABELS = %w[
+  unit
+  integration
+  benchmark
+  transactions
 ].freeze
 
-test_dir = File.expand_path('../test', __dir__)
+test_dir = File.expand_path("../test", __dir__)
 tests_missing_label = []
-invalid_labels = Set[]
+tests_missing_allowed_label = []
 
 Find.find(test_dir) do |path|
-    next unless File.file?(path)
-    next unless File.basename(path).start_with?('test_')
-    content = File.read(path)
-    content.delete("\n").scan(/TEST_CASE\(("(.*?)")\)/) do |match|
-        labels = match[0].scan(/\[(.*?)\]/)
-        if labels.empty?
-            tests_missing_label << "#{match[0]} (#{path})"
-        else
-            labels.flatten.each do |label|
-                unless ALLOWED_LABELS.include?(label)
-                    invalid_labels << label
-                end
-            end
-        end
+  next unless File.file?(path)
+  next unless File.basename(path).start_with?("test_")
+
+  content = File.read(path)
+  content.delete("\n").scan(/TEST_CASE\(("(.*?)")\)/) do |match|
+    test_name = "#{match[0]} (#{path})"
+    labels = match[0].scan(/\[(.*?)\]/)
+    if labels.empty?
+      tests_missing_label << test_name
+    elsif !labels.flatten.intersect?(ALLOWED_LABELS)
+      tests_missing_allowed_label << test_name
     end
+  end
 end
 
 unless tests_missing_label.empty?
-    puts "Tests missing label:"
-    tests_missing_label.each do |test|
-        puts "  #{test}"
-    end
+  puts "Tests missing label:"
+  tests_missing_label.each do |test|
+    puts "  #{test}"
+  end
 end
 
-unless invalid_labels.empty?
-    puts "Invalid labels found:"
-    invalid_labels.each do |label|
-        puts "  #{label}"
-    end
+unless tests_missing_allowed_label.empty?
+  puts "Tests have labels, but missing allowed ones:"
+  tests_missing_allowed_label.each do |label|
+    puts "  #{label}"
+  end
 end
 
-unless tests_missing_label.empty? && invalid_labels.empty?
-    puts "\nERROR: Missing or unexpected test labels found. This can result in tests not being run in CI."
-    exit 1
+unless tests_missing_label.empty? && tests_missing_allowed_label.empty?
+  puts "\nERROR: Missing or unexpected test labels found. This can result in tests not being run in CI."
+  exit 1
 end