Skip to content

Commit

Permalink
Merge pull request #96 from ptr727/develop
Browse files Browse the repository at this point in the history
Point to test.yml as example
  • Loading branch information
ptr727 authored Aug 22, 2023
2 parents c522e02 + 0ebe780 commit 26e4b6d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"cSpell.words": [
"appdata",
"btrfs",
"digitalwatchdog",
"dockerenv",
"domainname",
"dwspectrum",
Expand All @@ -13,13 +14,15 @@
"lsio",
"lsiobase",
"mediaserver",
"metavms",
"networkoptix",
"Newtonsoft",
"noatime",
"nodev",
"nosuid",
"nvrpool",
"nxmeta",
"nxvms",
"nxwitness",
"Optix",
"PGID",
Expand Down
5 changes: 3 additions & 2 deletions CreateMatrix/VersionRule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ internal class VersionRule
public static readonly List<VersionRule> 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" }
};

Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down

0 comments on commit 26e4b6d

Please sign in to comment.