Skip to content

Commit

Permalink
Merge pull request #111 from siemens/development
Browse files Browse the repository at this point in the history
Conan Implementation along with SEPP Integration v6.0.0
  • Loading branch information
karthika-g authored Jan 12, 2024
2 parents 94f6d30 + f3731b5 commit 9d4af5b
Show file tree
Hide file tree
Showing 314 changed files with 63,796 additions and 265,630 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
$sourceFolder = Join-Path $env:GITHUB_WORKSPACE "out" | Join-Path -ChildPath "*"
$outFolder = Join-Path $env:GITHUB_WORKSPACE "out" | Join-Path -ChildPath "continuous-clearing"
New-Item -ItemType Directory -Force -Path $outFolder
$fileName = "continuous-clearing-5.1.1.zip"
$fileName = "continuous-clearing-6.0.0.zip"
Write-Host "Filename: '$fileName'"
Write-Host "sourceFolder: '$sourceFolder'"
Write-Host "Outfolder: '$outFolder'"
Expand All @@ -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 All @@ -138,8 +138,8 @@ jobs:
- name: Create Nuget Packages
id: createNupkg
run: |
nuget pack CA.nuspec -Version 5.1.1
Write-Host "::set-output name=nupkg-LicenseClearingTool::continuous-clearing.5.1.1.nupkg"
nuget pack CA.nuspec -Version 6.0.0
Write-Host "::set-output name=nupkg-LicenseClearingTool::continuous-clearing.6.0.0.nupkg"
- name: Archive NuGet Packages
uses: actions/upload-artifact@v2
Expand All @@ -152,9 +152,9 @@ jobs:
id: builddocker
#if: ${{ false }} # disable for now
run: |
docker build . --file Dockerfile --tag ${{ github.repository }}:continuous-clearing-v5.1.1
docker save ${{ github.repository }}:continuous-clearing-v5.1.1 -o continuous-clearing-v5.1.1.tar
Write-Host "::set-output name=docker-LicenseClearingTool::continuous-clearing-v5.1.1.tar"
docker build . --file Dockerfile --tag ${{ github.repository }}:continuous-clearing-v6.0.0
docker save ${{ github.repository }}:continuous-clearing-v6.0.0 -o continuous-clearing-v6.0.0.tar
Write-Host "::set-output name=docker-LicenseClearingTool::continuous-clearing-v6.0.0.tar"
- name: Archive docker image
#if: ${{ false }} # disable for now
Expand Down Expand Up @@ -195,9 +195,9 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: v5.1.1
tag_name: v6.0.0
#tag_name: ${{ needs.build.outputs.semver }}
release_name: Release v5.1.1
release_name: Release v6.0.0
body: |
${{ github.event.head_commit.message }}
draft: true
Expand Down
3 changes: 2 additions & 1 deletion CA.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<package >
<metadata>
<id>continuous-clearing</id>
<version>5.1.1</version>
<version>6.0.0</version>
<authors>Siemens AG</authors>
<owners>continuous-clearing contributors</owners>
<projectUrl>https://github.com/siemens/continuous-clearing</projectUrl>
Expand Down 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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ RUN apt-get update && \
ENV PATH="/root/.local/bin:$PATH"

# Copying files from host to current working directory
COPY /out/net6.0 /app/out
COPY /out/net6.0 /app/out
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
![Publish NuGet Packages](https://github.com/siemens/continuous-clearing/workflows/Publish%20NuGet%20Packages/badge.svg)



# Introduction

The Continuous Clearing Tool scans and collects the 3rd party OSS components used in a NPM/NuGet/Maven/Python/Debian and uploads it to SW360 and Fossology by accepting respective project ID for license clearing.
Expand Down
320,583 changes: 57,731 additions & 262,852 deletions ReadmeOSS_continuous-clearing_DockerImage.html

Large diffs are not rendered by default.

4,318 changes: 2,590 additions & 1,728 deletions ReadmeOSS_continuous-clearing_nupkg.html

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
{
"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": "true"
},
{
"Name": "internal:siemens:clearing:repo-name",
"Value": "energy-dev-conan-egll"
},
{
"Name": "internal:siemens:clearing:project-type",
"Value": "CONAN"
},
{
"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-name",
"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
}
Loading

0 comments on commit 9d4af5b

Please sign in to comment.