From 0ebe780a81bb4dd8b05ce4105ee75d8d004a5257 Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Tue, 22 Aug 2023 08:50:47 -0700 Subject: [PATCH] Point to test.yml as example --- .vscode/settings.json | 3 +++ CreateMatrix/VersionRule.cs | 5 +++-- README.md | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index cb55c73..43c1ac3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,6 +5,7 @@ "cSpell.words": [ "appdata", "btrfs", + "digitalwatchdog", "dockerenv", "domainname", "dwspectrum", @@ -13,6 +14,7 @@ "lsio", "lsiobase", "mediaserver", + "metavms", "networkoptix", "Newtonsoft", "noatime", @@ -20,6 +22,7 @@ "nosuid", "nvrpool", "nxmeta", + "nxvms", "nxwitness", "Optix", "PGID", diff --git a/CreateMatrix/VersionRule.cs b/CreateMatrix/VersionRule.cs index 503b3f8..46835d8 100644 --- a/CreateMatrix/VersionRule.cs +++ b/CreateMatrix/VersionRule.cs @@ -12,7 +12,7 @@ internal class VersionRule public static readonly List DefaultRuleList = new() { // Use None to match any product or label - // Only v5.1 or later is supported + // Only v5.1 or later is supported with Ubuntu Jammy new VersionRule { Version = "5.1" } }; @@ -71,9 +71,10 @@ versionRule in ruleList.Where(versionRule => !versionRule.Evaluate(productInfo, versionInfo.Labels.RemoveAll(item => removeLabels.Contains(item)); } - // Mark the version to be removed + // Remove the version if it has no labels if (versionInfo.Labels.Count == 0) { + // Mark the version to be removed Log.Logger.Warning("{Product}:{Version} filtered out", productInfo.Product, versionInfo.Version); removeVersions.Add(versionInfo); result = false; diff --git a/README.md b/README.md index db8388d..29ff1f5 100644 --- a/README.md +++ b/README.md @@ -187,7 +187,7 @@ services: Refer to the [nxvms-docker](https://github.com/networkoptix/nxvms-docker#volumes-description) page for volume mapping details. -Note that the directory names are dependent on the product being used: +Note that the directory names are dependent on the product being used (see [`Test.yml`](./Make/Test.yml) for examples): - NxWitness: `networkoptix` - DWSpectrum: `digitalwatchdog`