Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conanpackage downloader #102

Merged
merged 24 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
DOCKERDEVARTIFACTORY: ${{ secrets.DOCKERDEVARTIFACTORY }}

- name: Test
#if: ${{ false }} # disable for now
if: ${{ false }} # disable for now
run: |
$TestProjects = Get-ChildItem -Path *test*.csproj -Recurse -exclude TestUtilities.csproj,UnitTestUtilities.csproj
Write-Host "**************************The test projects considered for execution: $TestProjects ******************************"
Expand Down
1 change: 1 addition & 0 deletions CA.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@
<file src="out\net6.0\NuGet.Versioning.dll" target="tools"/>
<file src="out\net6.0\NuGet.Resolver.dll" target="tools"/>
<file src="out\net6.0\Tommy.dll" target="tools"/>
<file src="out\net6.0\YamlDotNet.dll" target="tools"/>
<file src="out\net6.0\runtimes\linux-arm\native\libpsl-native.so" target="tools\runtimes\linux-arm\native"/>
<file src="out\net6.0\runtimes\linux-arm64\native\libpsl-native.so" target="tools\runtimes\linux-arm64\native"/>
<file src="out\net6.0\runtimes\linux-musl-x64\native\libpsl-native.so" target="tools\runtimes\linux-musl-x64\native"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
{
"BomFormat": "CycloneDX",
"SpecVersion": 4,
"SpecVersionString": "1.4",
"SerialNumber": null,
"Version": null,
"Metadata": {
"Tools": [
{
"Vendor": "Siemens AG",
"Name": "Clearing Automation Tool",
"Version": "5.0.0",
"Hashes": null
}
],
"Authors": null,
"Component": null,
"Manufacture": null,
"Supplier": null
},
"Components": [
{
"Type": 0,
"MimeType": null,
"BomRef": "pkg:conan/[email protected]",
"Supplier": null,
"Author": null,
"Publisher": null,
"Group": null,
"Name": "protobuf",
"Version": "3.21.9",
"Description": "",
"Scope": null,
"Hashes": null,
"Licenses": null,
"Copyright": null,
"Cpe": null,
"Purl": "pkg:conan/[email protected]",
"Swid": null,
"Modified": null,
"Pedigree": null,
"Components": null,
"Properties": [
{
"Name": "internal:siemens:clearing:development",
"Value": "false"
},
{
"Name": "internal:siemens:clearing:identifier-type",
"Value": "Discovered"
},
{
"Name": "internal:siemens:clearing:is-internal",
"Value": "false"
},
{
"Name": "internal:siemens:clearing:repo-url",
"Value": "energy-dev-conan-egll"
},
{
"Name": "internal:siemens:clearing:project-type",
"Value": "CONAN"
},
{
"Name": "internal:siemens:clearing:clearing-state",
"Value": "Approved"
},
{
"Name": "internal:siemens:clearing:sw360:release-url",
"Value": "http://md2pdvnc.ad001.siemens.net:8095/resource/api/releases/e13e0e564b004ef4adabbd01bf0b93ce"
},
{
"Name": "internal:siemens:clearing:fossology:url",
"Value": null
}
],
"Evidence": null
},
{
"Type": 0,
"MimeType": null,
"BomRef": "pkg:conan/[email protected]",
"Supplier": null,
"Author": null,
"Publisher": null,
"Group": null,
"Name": "zlib",
"Version": "1.2.11",
"Description": "",
"Scope": null,
"Hashes": null,
"Licenses": null,
"Copyright": null,
"Cpe": null,
"Purl": "pkg:conan/[email protected]",
"Swid": null,
"Modified": null,
"Pedigree": null,
"Components": null,
"Properties": [
{
"Name": "internal:siemens:clearing:development",
"Value": "false"
},
{
"Name": "internal:siemens:clearing:identifier-type",
"Value": "Discovered"
},
{
"Name": "internal:siemens:clearing:is-internal",
"Value": "false"
},
{
"Name": "internal:siemens:clearing:repo-url",
"Value": "Not Found in JFrogRepo"
},
{
"Name": "internal:siemens:clearing:project-type",
"Value": "CONAN"
},
{
"Name": "internal:siemens:clearing:clearing-state",
"Value": "NEW_CLEARING"
},
{
"Name": "internal:siemens:clearing:sw360:release-url",
"Value": "http://md2pdvnc.ad001.siemens.net:8095/resource/api/releases/701403e53f254fc5a074e24fd867be2c"
},
{
"Name": "internal:siemens:clearing:fossology:url",
"Value": null
}
],
"Evidence": null
}
],
"Dependencies": [
{
"Ref": "pkg:conan/[email protected]",
"Dependencies": [
{
"Ref": "pkg:conan/[email protected]",
"Dependencies": null
}
]
}
],
"Compositions": null
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
{
"graph_lock": {
"nodes": {
"0": {
"options": "libcurl:static=None\nopenssl:static=False",
"requires": [
"1",
"2",
"3",
"4",
"5",
"6",
"7",
"8",
"9",
"10",
"11",
"12",
"13",
"14",
"15",
"16"
],
"build_requires": [
"17"
],
"path": "conan\\conanfile\\linux-x86_64",
"context": "host"
},
"1": {
"ref": "rapidjson/1.1.0-csc-01@siemens-energy/stable#6d624490b731387491675eebeff7ab66",
"options": "",
"package_id": "5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9",
"prev": "85ca839500f017c06cd5c39b4ad50c5e",
"context": "host"
},
"2": {
"ref": "libest/3.2.0-shared.5@siemens-energy/stable#0",
"options": "",
"package_id": "49e7f59961e8ed9b7d1d33caa2e6d613b00b72a5",
"prev": "0",
"context": "host"
},
"3": {
"ref": "openssl/3.0.9-shared.3@siemens-energy/stable#0",
"options": "static=False",
"package_id": "49e7f59961e8ed9b7d1d33caa2e6d613b00b72a5",
"prev": "0",
"context": "host"
},
"4": {
"ref": "sqlite/3.37.0-shared.1@siemens-energy/stable#0",
"options": "",
"package_id": "49e7f59961e8ed9b7d1d33caa2e6d613b00b72a5",
"prev": "0",
"context": "host"
},
"5": {
"ref": "oss_mbedtls/2.28.2-shared@siemens-energy/stable#0",
"options": "",
"package_id": "5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9",
"prev": "0",
"context": "host"
},
"6": {
"ref": "mongoose/v7.11-csc-01@siemens-energy/stable#7084912b9de8ac5f93c2e8aa16c259a8",
"options": "",
"package_id": "5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9",
"prev": "c4b1dedbd2bd5223337ce892732c693e",
"context": "host"
},
"7": {
"ref": "basics/1.0.8@siemens-energy/stable#0",
"options": "",
"package_id": "5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9",
"prev": "0",
"context": "host"
},
"8": {
"ref": "osal/1.0.30@siemens-energy/stable#21e224648b08c0c356e2e60d0f143ae7",
"options": "",
"package_id": "5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9",
"prev": "f5db57253fc37159485da5d9d37d4844",
"context": "host"
},
"9": {
"ref": "SecurityBasics/2.10.2@siemens-energy/stable#0",
"options": "",
"package_id": "5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9",
"prev": "0",
"context": "host"
},
"10": {
"ref": "securityaccessmanager/2.2.6@siemens-energy/stable#7522ada1783555e22afd338d9bd03d60",
"options": "",
"package_id": "5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9",
"prev": "493721829e0ba6c4cccb9304acc9ad71",
"context": "host"
},
"11": {
"ref": "SecurityEventLogger/2.0.24@siemens-energy/stable#ddd584e3d5551e3ba568f07b95a9e6af",
"options": "",
"package_id": "5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9",
"prev": "f32d263a0ba627319365f9ee41781589",
"context": "host"
},
"12": {
"ref": "securitypkimanager/2.6.3@siemens-energy/stable#a8d80c7af932e2062513e94fd2001077",
"options": "",
"package_id": "5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9",
"prev": "33612b4203a7c283c1dd56aa795863f6",
"context": "host"
},
"13": {
"ref": "SecurityStorageManager/2.11.2@siemens-energy/stable#6c98465724cb00ab842f16a6a17c64b6",
"options": "",
"package_id": "5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9",
"prev": "8f87b12afc830478491b566d2b7bf7e1",
"context": "host"
},
"14": {
"ref": "securitycommunicationmanager/2.6.5@siemens-energy/stable#fbacb77f419f7c1dc2af769841266fba",
"options": "",
"package_id": "5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9",
"prev": "dcd1c2048a844e785cb79e918452d56e",
"context": "host"
},
"15": {
"ref": "openldap/2.6.4-shared-ossl3.1@siemens-energy/stable#0",
"options": "",
"package_id": "49e7f59961e8ed9b7d1d33caa2e6d613b00b72a5",
"prev": "0",
"context": "host"
},
"16": {
"ref": "libcurl/7.87.0-shared-ossl3.1@siemens-energy/stable#0",
"options": "static=None",
"package_id": "49e7f59961e8ed9b7d1d33caa2e6d613b00b72a5",
"prev": "0",
"context": "host"
},
"17": {
"ref": "googletest/1.8.0@siemens-energy/stable#0",
"options": "",
"package_id": "5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9",
"prev": "0",
"context": "host"
}
},
"revisions_enabled": true
},
"version": "0.4",
"profile_host": "[settings]\narch=x86_64\narch_build=x86_64\nbuild_type=Release\ncompiler=gcc\ncompiler.libcxx=libstdc++11\ncompiler.version=9.3\nos=Linux\nos_build=Linux\nswsign:os=Windows\nswsign:os_build=Windows\nswsign:compiler=Visual Studio\nswsign:compiler.version=15\nswsign:build_type=Release\nswsign:compiler.runtime=MD\nmbedtls_csc:os=Windows\nmbedtls_csc:os_build=Windows\nmbedtls_csc:compiler=Visual Studio\nmbedtls_csc:compiler.version=15\nmbedtls_csc:build_type=Release\nmbedtls_csc:compiler.runtime=MD\n[options]\nopenssl:static=False\n[build_requires]\n[env]\n"
}
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,63 @@
}
],
"Evidence": null
},
{
"Type": 0,
"MimeType": null,
"BomRef": "pkg:conan/[email protected]",
"Supplier": null,
"Author": null,
"Publisher": null,
"Group": null,
"Name": "protobuf",
"Version": "3.21.9",
"Description": "",
"Scope": null,
"Hashes": null,
"Licenses": null,
"Copyright": null,
"Cpe": null,
"Purl": "pkg:conan/[email protected]",
"Swid": null,
"Modified": null,
"Pedigree": null,
"Components": null,
"Properties": [
{
"Name": "internal:siemens:clearing:development",
"Value": "false"
},
{
"Name": "internal:siemens:clearing:identifier-type",
"Value": "Discovered"
},
{
"Name": "internal:siemens:clearing:is-internal",
"Value": "false"
},
{
"Name": "internal:siemens:clearing:repo-url",
"Value": "energy-dev-conan-egll"
},
{
"Name": "internal:siemens:clearing:project-type",
"Value": "CONAN"
},
{
"Name": "internal:siemens:clearing:clearing-state",
"Value": "Approved"
},
{
"Name": "internal:siemens:clearing:sw360:release-url",
"Value": "http://md2pdvnc.ad001.siemens.net:8095/resource/api/releases/e13e0e564b004ef4adabbd01bf0b93ce"
},
{
"Name": "internal:siemens:clearing:fossology:url",
"Value": null
}
],
"Evidence": null
}
],
"Compositions": null
Expand Down
2 changes: 1 addition & 1 deletion src/AritfactoryUploader.UTest/PackageUploadHelperTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public void GetComponentListFromComparisonBOM_GivenComparisonBOM_ReturnsComponen
//Act
Bom componentList = PackageUploadHelper.GetComponentListFromComparisonBOM(comparisonBOMPath);
// Assert
Assert.That(11, Is.EqualTo(componentList.Components.Count), "Checks for no of components");
Assert.That(12, Is.EqualTo(componentList.Components.Count), "Checks for no of components");
}

[Test]
Expand Down
Loading
Loading