Architecture-independent is "noarch" for RPM, "all" for deb

This commit is contained in:
Frederik Carlier
2019-11-23 21:41:16 +01:00
parent 8e230c8081
commit 00610664e9
4 changed files with 12 additions and 12 deletions

View File

@@ -16,13 +16,13 @@ namespace Packaging.Targets.Tests.Deb
/// <param name="packageAchitecture">
/// The expected package architecture.
/// </param>
[InlineData(null, "any")]
[InlineData("ubuntu.18.04", "any")]
[InlineData(null, "all")]
[InlineData("ubuntu.18.04", "all")]
[InlineData("ubuntu.18.04-x86", "i386")]
[InlineData("ubuntu.18.04-x64", "amd64")]
[InlineData("ubuntu.18.04-arm", "armhf")]
[InlineData("ubuntu.18.04-arm64", "arm64")]
[InlineData("linux", "any")]
[InlineData("linux", "all")]
[InlineData("linux-x86", "i386")]
[InlineData("linux-x64", "amd64")]
[InlineData("linux-arm", "armhf")]

View File

@@ -16,13 +16,13 @@ namespace Packaging.Targets.Tests.Rpm
/// <param name="packageAchitecture">
/// The expected package architecture.
/// </param>
[InlineData(null, "any")]
[InlineData("ubuntu.18.04", "any")]
[InlineData("ubuntu.18.04-x86", "i386")]
[InlineData("ubuntu.18.04-x64", "x86_64")]
[InlineData("ubuntu.18.04-arm", "armhfp")]
[InlineData("ubuntu.18.04-arm64", "aarch64")]
[InlineData("linux", "any")]
[InlineData(null, "noarch")]
[InlineData("centos.7", "noarch")]
[InlineData("centos.7-x86", "i386")]
[InlineData("centos.7-x64", "x86_64")]
[InlineData("centos.7-arm", "armhfp")]
[InlineData("centos.7-arm64", "aarch64")]
[InlineData("linux", "noarch")]
[InlineData("linux-x86", "i386")]
[InlineData("linux-x64", "x86_64")]
[InlineData("linux-arm", "armhfp")]

View File

@@ -171,7 +171,7 @@ namespace Packaging.Targets
}
}
return "any";
return "all";
}
public override bool Execute()

View File

@@ -234,7 +234,7 @@ namespace Packaging.Targets
}
}
return "any";
return "noarch";
}
public override bool Execute()