From 60175dd43ec44cff87f4b8b4e47f4ccc858f74d2 Mon Sep 17 00:00:00 2001 From: Aditya Narayan Date: Tue, 16 Jan 2024 18:24:50 +0530 Subject: [PATCH 01/15] updating the readMe --- doc/UsageDoc/CA_UsageDocument.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/UsageDoc/CA_UsageDocument.md b/doc/UsageDoc/CA_UsageDocument.md index 678523df..77d3b891 100644 --- a/doc/UsageDoc/CA_UsageDocument.md +++ b/doc/UsageDoc/CA_UsageDocument.md @@ -52,6 +52,12 @@ The Continuous Clearing Tool helps the Project Manager/Developer to automate the Continuous Clearing Tool reduces the effort in creating components in SW360 and identifying the matching source codes from the public repository. Tool eliminates the manual error while creating component and identifying correct version of source code from public repository. Continuous Clearing Tool harmonize the creation of 3P components in SW360 by filling necessary information. +The Continuous Clearing Tool incorporates SEPP tool functionalities, seamlessly integrated into the [Artifactory uploader](../usagedocimg/artifactoryuploader.PNG). +This integration ensures +- Software License Clearing is done. +- No pre-release versions of re-use components are used. +- Trace-ability is guaranteed + # Continuous Clearing Tool workflow diagram - Package Identifier From dea02c8b97aa4835e4187c65631f510857b53409 Mon Sep 17 00:00:00 2001 From: Aditya Narayan Date: Tue, 16 Jan 2024 18:25:14 +0530 Subject: [PATCH 02/15] updating the operation type for log message to copy for development type packages --- src/ArtifactoryUploader/ArtifactoryUploader.cs | 2 +- src/ArtifactoryUploader/PackageUploadHelper.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ArtifactoryUploader/ArtifactoryUploader.cs b/src/ArtifactoryUploader/ArtifactoryUploader.cs index d26f4034..82dc3912 100644 --- a/src/ArtifactoryUploader/ArtifactoryUploader.cs +++ b/src/ArtifactoryUploader/ArtifactoryUploader.cs @@ -32,7 +32,7 @@ public static class ArtfactoryUploader public static async Task UploadPackageToRepo(ComponentsToArtifactory component, int timeout) { Logger.Debug("Starting UploadPackageToArtifactory method"); - string operationType = component.PackageType == PackageType.ClearedThirdParty ? "copy" : "move"; + string operationType = component.PackageType == PackageType.ClearedThirdParty || component.PackageType == PackageType.Development ? "copy" : "move"; string dryRunSuffix = component.DryRun ? " dry-run" : ""; HttpResponseMessage responsemessage = new HttpResponseMessage(); try diff --git a/src/ArtifactoryUploader/PackageUploadHelper.cs b/src/ArtifactoryUploader/PackageUploadHelper.cs index 33fb6a76..37362065 100644 --- a/src/ArtifactoryUploader/PackageUploadHelper.cs +++ b/src/ArtifactoryUploader/PackageUploadHelper.cs @@ -392,7 +392,7 @@ private static async Task PackageUploadToArtifactory(UploaderKpiData uploaderKpi { if (!(item.SrcRepoName.Contains("Not Found in JFrog"))) { - string operationType = item.PackageType == PackageType.ClearedThirdParty ? "copy" : "move"; + string operationType = item.PackageType == PackageType.ClearedThirdParty || item.PackageType == PackageType.Development ? "copy" : "move"; ArtfactoryUploader.jFrogService = jFrogService; HttpResponseMessage responseMessage = await ArtfactoryUploader.UploadPackageToRepo(item, timeout); From 1173dcf221ea68faba3bc6658ea0c832a7030383 Mon Sep 17 00:00:00 2001 From: Aditya Narayan Date: Wed, 17 Jan 2024 19:28:48 +0530 Subject: [PATCH 03/15] marking Development Packages to be Copied in the KPI --- src/ArtifactoryUploader/Model/UploaderKpiData.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ArtifactoryUploader/Model/UploaderKpiData.cs b/src/ArtifactoryUploader/Model/UploaderKpiData.cs index 3c76cfd5..5c85c2a1 100644 --- a/src/ArtifactoryUploader/Model/UploaderKpiData.cs +++ b/src/ArtifactoryUploader/Model/UploaderKpiData.cs @@ -39,13 +39,13 @@ public class UploaderKpiData [DisplayName(@"Time taken by ComponentCreator")] public double TimeTakenByComponentCreator { get; set; } - [DisplayName(@"Development Packages to be Moved to Siparty DevDep Repo")] + [DisplayName(@"Development Packages to be Copied to Siparty DevDep Repo")] public int DevPackagesToBeUploaded { get; set; } - [DisplayName(@"Development Packages Moved to Siparty DevDep Repo")] + [DisplayName(@"Development Packages Copied to Siparty DevDep Repo")] public int DevPackagesUploaded { get; set; } - [DisplayName(@"Development Packages Not Moved to Siparty DevDep Repo")] + [DisplayName(@"Development Packages Not Copied to Siparty DevDep Repo")] public int DevPackagesNotUploadedToJfrog { get; set; } [DisplayName(@"Internal Packages to be Moved")] From 9ac8687f34f5082a6a72732a69ac1a8fb0c181f3 Mon Sep 17 00:00:00 2001 From: Aditya Narayan Date: Wed, 17 Jan 2024 19:29:17 +0530 Subject: [PATCH 04/15] setting exit code to be 2 if there is failure or if the component is not approved --- src/ArtifactoryUploader/PackageUploader.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/ArtifactoryUploader/PackageUploader.cs b/src/ArtifactoryUploader/PackageUploader.cs index 7bd84988..deb82982 100644 --- a/src/ArtifactoryUploader/PackageUploader.cs +++ b/src/ArtifactoryUploader/PackageUploader.cs @@ -57,6 +57,13 @@ public static async Task UploadPackageToArtifactory(CommonAppSettings appSetting uploaderKpiData.TimeTakenByComponentCreator = TimeSpan.FromMilliseconds(Program.UploaderStopWatch.ElapsedMilliseconds).TotalSeconds; Logger.Debug($"UploadPackageToArtifactory():End"); + + // set the error code + if(uploaderKpiData.PackagesNotUploadedDueToError > 0 || uploaderKpiData.ComponentNotApproved > 0) + { + Environment.ExitCode = 2; + Logger.Debug("Setting ExitCode to 2"); + } } } } From 2ea250deef4db170af14c99b98407628b735fcf7 Mon Sep 17 00:00:00 2001 From: Aditya Narayan Date: Wed, 17 Jan 2024 19:29:35 +0530 Subject: [PATCH 05/15] Adding/updating the log message --- src/ArtifactoryUploader/PackageUploadHelper.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ArtifactoryUploader/PackageUploadHelper.cs b/src/ArtifactoryUploader/PackageUploadHelper.cs index 37362065..5b328815 100644 --- a/src/ArtifactoryUploader/PackageUploadHelper.cs +++ b/src/ArtifactoryUploader/PackageUploadHelper.cs @@ -402,16 +402,18 @@ private static async Task PackageUploadToArtifactory(UploaderKpiData uploaderKpi } else if (responseMessage.ReasonPhrase == ApiConstant.PackageNotFound) { - Logger.Error($"Package {item.Name}-{item.Version} not found in remote cache, Upload Failed!!"); + Logger.Error($"Package {item.Name}-{item.Version} not found in {item.SrcRepoName}, Upload Failed!!"); IncrementCountersBasedOnPackageType(uploaderKpiData, packageType, false); item.DestRepoName = null; SetWarningCode = true; } else if (responseMessage.ReasonPhrase == ApiConstant.ErrorInUpload) { - Logger.Error($"Package {item.Name}-{item.Version} {operationType} Failed!!"); + Logger.Error($"Package {item.Name}-{item.Version} {operationType} Failed!! {item.SrcRepoName} ---> {item.DestRepoName}"); IncrementCountersBasedOnPackageType(uploaderKpiData, packageType, false); item.DestRepoName = null; + var responseContent = await responseMessage.Content.ReadAsStringAsync(); + Logger.Debug($"JFrog Response - {responseContent}"); } else { From b252bef539c39de1f0dc722a59039f009ee584e6 Mon Sep 17 00:00:00 2001 From: Aditya Narayan Date: Thu, 18 Jan 2024 12:23:48 +0530 Subject: [PATCH 06/15] updating the condition in which the status code is -2 --- src/ArtifactoryUploader/PackageUploader.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ArtifactoryUploader/PackageUploader.cs b/src/ArtifactoryUploader/PackageUploader.cs index deb82982..f8d417f2 100644 --- a/src/ArtifactoryUploader/PackageUploader.cs +++ b/src/ArtifactoryUploader/PackageUploader.cs @@ -59,7 +59,7 @@ public static async Task UploadPackageToArtifactory(CommonAppSettings appSetting Logger.Debug($"UploadPackageToArtifactory():End"); // set the error code - if(uploaderKpiData.PackagesNotUploadedDueToError > 0 || uploaderKpiData.ComponentNotApproved > 0) + if(uploaderKpiData.PackagesNotUploadedDueToError > 0 || uploaderKpiData.PackagesNotExistingInRemoteCache > 0) { Environment.ExitCode = 2; Logger.Debug("Setting ExitCode to 2"); From ac315ba69ee5e694b193af0cb07394fbedecbf3d Mon Sep 17 00:00:00 2001 From: Aditya Narayan Date: Thu, 18 Jan 2024 14:43:02 +0530 Subject: [PATCH 07/15] Updating the IT to handle warning response code in artifactory uploader --- .../Conan/ArtifactoryUploaderConan.cs | 7 +++++-- .../Maven/ArtifactoryUploaderMaven.cs | 8 +++++--- src/SW360IntegrationTest/NPM/ArtifactoryUploaderNpm.cs | 9 ++++++--- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/SW360IntegrationTest/Conan/ArtifactoryUploaderConan.cs b/src/SW360IntegrationTest/Conan/ArtifactoryUploaderConan.cs index dd723892..d7e17863 100644 --- a/src/SW360IntegrationTest/Conan/ArtifactoryUploaderConan.cs +++ b/src/SW360IntegrationTest/Conan/ArtifactoryUploaderConan.cs @@ -19,7 +19,7 @@ public void TestArtifactoryUploaderexe() string comparisonBOMPath = OutFolder + @"\..\..\TestFiles\IntegrationTestFiles\ArtifactoryUploaderTestData\ConanComparisonBOM.json"; // Test BOM Creator ran with exit code 0 - Assert.AreEqual(0, TestHelper.RunArtifactoryUploaderExe(new string[]{ + int result = TestHelper.RunArtifactoryUploaderExe(new string[]{ TestConstant.BomFilePath, comparisonBOMPath, TestConstant.SW360ProjectName, testParameters.SW360ProjectName, TestConstant.ArtifactoryUser, testParameters.ArtifactoryUploadUser, @@ -29,7 +29,10 @@ public void TestArtifactoryUploaderexe() TestConstant.JfrogConanInternalDestRepoName,testParameters.InternalDestinationRepoName, TestConstant.JFrogApiURL,testParameters.JfrogApi, TestConstant.Release, false.ToString() - }), + }); + + // Test BOM Creator ran with exit code 0 or 2 (Warning) + Assert.IsTrue(result == 0 || result == 2, "Test to run Artifactory Uploader EXE execution"); } diff --git a/src/SW360IntegrationTest/Maven/ArtifactoryUploaderMaven.cs b/src/SW360IntegrationTest/Maven/ArtifactoryUploaderMaven.cs index 600f569d..7e9c66c1 100644 --- a/src/SW360IntegrationTest/Maven/ArtifactoryUploaderMaven.cs +++ b/src/SW360IntegrationTest/Maven/ArtifactoryUploaderMaven.cs @@ -24,8 +24,7 @@ public void TestArtifactoryUploaderexe() OutFolder = TestHelper.OutFolder; string comparisonBOMPath = OutFolder + @"\..\..\TestFiles\MavenTestFile\ArtifactoryUploaderTestData\MavenComparisonBOM.json"; - // Test BOM Creator ran with exit code 0 - Assert.AreEqual(0, TestHelper.RunArtifactoryUploaderExe(new string[]{ + int result = TestHelper.RunArtifactoryUploaderExe(new string[]{ TestConstant.BomFilePath, comparisonBOMPath, TestConstant.SW360ProjectName, testParameters.SW360ProjectName, TestConstant.ArtifactoryUser, testParameters.ArtifactoryUploadUser, @@ -35,7 +34,10 @@ public void TestArtifactoryUploaderexe() TestConstant.JfrogMavenInternalDestRepoName,testParameters.InternalDestinationRepoName, TestConstant.JFrogApiURL,testParameters.JfrogApi, TestConstant.Release, false.ToString() - }), + }); + + // Test BOM Creator ran with exit code 0 or 2 (Warning) + Assert.IsTrue(result == 0 || result == 2, "Test to run Artifactory Uploader EXE execution"); } [Test, Order(2)] diff --git a/src/SW360IntegrationTest/NPM/ArtifactoryUploaderNpm.cs b/src/SW360IntegrationTest/NPM/ArtifactoryUploaderNpm.cs index d5821629..cbfb09c6 100644 --- a/src/SW360IntegrationTest/NPM/ArtifactoryUploaderNpm.cs +++ b/src/SW360IntegrationTest/NPM/ArtifactoryUploaderNpm.cs @@ -24,8 +24,8 @@ public void TestArtifactoryUploaderexe() OutFolder = TestHelper.OutFolder; string comparisonBOMPath = OutFolder + @"\..\..\TestFiles\IntegrationTestFiles\ArtifactoryUploaderTestData\NPMComparisonBOM.json"; - // Test BOM Creator ran with exit code 0 - Assert.AreEqual(0, TestHelper.RunArtifactoryUploaderExe(new string[]{ + + int result = TestHelper.RunArtifactoryUploaderExe(new string[]{ TestConstant.BomFilePath, comparisonBOMPath, TestConstant.SW360ProjectName, testParameters.SW360ProjectName, TestConstant.ArtifactoryUser, testParameters.ArtifactoryUploadUser, @@ -35,7 +35,10 @@ public void TestArtifactoryUploaderexe() TestConstant.JfrogNpmInternalDestRepoName,testParameters.InternalDestinationRepoName, TestConstant.JFrogApiURL,testParameters.JfrogApi, TestConstant.Release, false.ToString() - }), + }); + + // Test BOM Creator ran with exit code 0 or 2 (Warning) + Assert.IsTrue(result == 0 || result == 2, "Test to run Artifactory Uploader EXE execution"); } From 2d356f52e5155810016371cd2b54356dd55cacb5 Mon Sep 17 00:00:00 2001 From: Aditya Narayan <57411194+adityanarayanp@users.noreply.github.com> Date: Tue, 23 Jan 2024 10:14:59 +0530 Subject: [PATCH 08/15] Update CA_UsageDocument.md - adding more details on what happens to SEPP --- doc/UsageDoc/CA_UsageDocument.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/doc/UsageDoc/CA_UsageDocument.md b/doc/UsageDoc/CA_UsageDocument.md index 77d3b891..9da917a1 100644 --- a/doc/UsageDoc/CA_UsageDocument.md +++ b/doc/UsageDoc/CA_UsageDocument.md @@ -52,12 +52,38 @@ The Continuous Clearing Tool helps the Project Manager/Developer to automate the Continuous Clearing Tool reduces the effort in creating components in SW360 and identifying the matching source codes from the public repository. Tool eliminates the manual error while creating component and identifying correct version of source code from public repository. Continuous Clearing Tool harmonize the creation of 3P components in SW360 by filling necessary information. +# SEPP Integration with Continuous Clearing Tool + The Continuous Clearing Tool incorporates SEPP tool functionalities, seamlessly integrated into the [Artifactory uploader](../usagedocimg/artifactoryuploader.PNG). This integration ensures - Software License Clearing is done. - No pre-release versions of re-use components are used. - Trace-ability is guaranteed +### What is SEPP tool performing currently ? + +* Check for third-party packages in artifactory +* Move internal packages from energy-dev- to energy-release- repos/ +* Clone Git repositories. +* Export JSON file for Long term Archiving (LTA-Export) + +### What are the existing functionalities of Continuous Clearing Tool ? + +* Check for third party packages +* Identification of correct source code from github +* Creating third party components in SW360 +* Triggering source code scan in FOSSology +* Copy cleared third party components from remote repo to SIPARTY release repo. + +### Which functionality of SEPP did Continuous Clearing adapt newly ? + +* Move internal packages from energy-dev-* to energy-release-* repos +* Copy development dependency packages to siparty-devdep-* repos + +### What happens to SEPP now ? + +Currently LTA support is not provided for SBOM, hence until that is implemented SEPP will coexist with continuous clearing tool .Once the implementation is done SEPP will eventually phase out. + # Continuous Clearing Tool workflow diagram - Package Identifier From 9f843c6855c24863d8aec3fa647fbbdd496544fc Mon Sep 17 00:00:00 2001 From: Aditya Narayan <57411194+adityanarayanp@users.noreply.github.com> Date: Wed, 24 Jan 2024 10:54:25 +0530 Subject: [PATCH 09/15] Update README.md by adding details of the SEPP integration --- README.md | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/README.md b/README.md index 2fd02667..8884cb2b 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,38 @@ To ensure such practises are in place, we need to provide software bill of mater This tool has been logically split into 3 different executables that enable it to be used as separate modules as per the user's requirement. **_Note: Continuous Clearing Tool internally uses [Syft](https://github.com/anchore/syft) for component detection for debian type projects._** + +# SEPP Integration with Continuous Clearing Tool + +The Continuous Clearing Tool incorporates SEPP tool functionalities, seamlessly integrated into the [Artifactory uploader](https://github.com/siemens/continuous-clearing/blob/main/doc/usagedocimg/artifactoryuploader.PNG). +This integration ensures +- Software License Clearing is done. +- No pre-release versions of re-use components are used. +- Trace-ability is guaranteed + +### What is SEPP tool performing currently ? + +* Check for third-party packages in artifactory +* Move internal packages from energy-dev- to energy-release- repos/ +* Clone Git repositories. +* Export JSON file for Long term Archiving (LTA-Export) + +### What are the existing functionalities of Continuous Clearing Tool ? +* Check for third party packages +* Identification of correct source code from github +* Creating third party components in SW360 +* Triggering source code scan in FOSSology +* Copy cleared third party components from remote repo to SIPARTY release repo. + +### Which functionality of SEPP did Continuous Clearing adapt newly ? + +* Move internal packages from energy-dev-* to energy-release-* repos +* Copy development dependency packages to siparty-devdep-* repos + +### What happens to SEPP now ? + +Currently LTA support is not provided for SBOM, hence until that is implemented SEPP will coexist with continuous clearing tool .Once the implementation is done SEPP will eventually phase out. # Package Installation ### Install from GitHub Release (Official) From dd23e6942830291cf9937ca39d3a5e1e19cef25e Mon Sep 17 00:00:00 2001 From: prasenjeetnath <147582543+prasenjeetnath@users.noreply.github.com> Date: Wed, 24 Jan 2024 12:45:27 +0530 Subject: [PATCH 10/15] Update compile.yml --- .github/workflows/compile.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 9b5744d0..7f2c2b10 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -75,6 +75,12 @@ jobs: - name: Restore Packages run: dotnet restore src\LicenseClearingTool.sln + + - name: get nuspec version from file + shell: pwsh + run: | + $version = Get-Content version.txt | ForEach-Object { $_.split(".nuspec")[1]} + $version.Substring(0,$version.Length-1) - name: Build run: msbuild -m -t:Rebuild -p:Configuration=Release -bl:continous-clearing.binlog -noconlog src\LicenseClearingTool.sln From fc9b2d5f70b20383873c9b5d83f454d39282ed7c Mon Sep 17 00:00:00 2001 From: prasenjeetnath <147582543+prasenjeetnath@users.noreply.github.com> Date: Wed, 24 Jan 2024 15:31:18 +0530 Subject: [PATCH 11/15] Update compile.yml --- .github/workflows/compile.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 7f2c2b10..0d4f9b79 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -43,7 +43,7 @@ jobs: id: gitversion run: | echo "SemVer: v$($env:GitVersion_SemVer)" - Write-Host "::set-output name=semver::v$($env:GitVersion_SemVer)" + Write-Host "::set-output name=semver::$($env:GitVersion_MajorMinorPatch)" $fileName = "dummy-v$($env:GitVersion_SemVer)" echo "SemVerMMP: v$($env:GitVersion_MajorMinorPatch)" Write-Host "Filename: '$fileName'" @@ -100,7 +100,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-6.0.0.zip" + $fileName = "continuous-clearing-v$($env:GitVersion_MajorMinorPatch).zip" Write-Host "Filename: '$fileName'" Write-Host "sourceFolder: '$sourceFolder'" Write-Host "Outfolder: '$outFolder'" @@ -144,8 +144,8 @@ jobs: - name: Create Nuget Packages id: createNupkg run: | - nuget pack CA.nuspec -Version 6.0.0 - Write-Host "::set-output name=nupkg-LicenseClearingTool::continuous-clearing.6.0.0.nupkg" + nuget pack CA.nuspec -Version $($env:GitVersion_MajorMinorPatch) + Write-Host "::set-output name=nupkg-LicenseClearingTool::continuous-clearing$($env:GitVersion_MajorMinorPatch).nupkg" - name: Archive NuGet Packages uses: actions/upload-artifact@v2 From 69e167059088d46e6f00fe72d278537d5e574568 Mon Sep 17 00:00:00 2001 From: prasenjeetnath <147582543+prasenjeetnath@users.noreply.github.com> Date: Wed, 24 Jan 2024 16:51:59 +0530 Subject: [PATCH 12/15] Update compile.yml --- .github/workflows/compile.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 0d4f9b79..1a97b474 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -75,12 +75,6 @@ jobs: - name: Restore Packages run: dotnet restore src\LicenseClearingTool.sln - - - name: get nuspec version from file - shell: pwsh - run: | - $version = Get-Content version.txt | ForEach-Object { $_.split(".nuspec")[1]} - $version.Substring(0,$version.Length-1) - name: Build run: msbuild -m -t:Rebuild -p:Configuration=Release -bl:continous-clearing.binlog -noconlog src\LicenseClearingTool.sln From a7a040657fc919f9809ffa0d5be47ff6d659bbd3 Mon Sep 17 00:00:00 2001 From: prasenjeetnath <147582543+prasenjeetnath@users.noreply.github.com> Date: Wed, 24 Jan 2024 18:14:27 +0530 Subject: [PATCH 13/15] Update compile.yml --- .github/workflows/compile.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 1a97b474..15c41068 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -152,9 +152,9 @@ jobs: id: builddocker #if: ${{ false }} # disable for now run: | - 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" + docker build . --file Dockerfile --tag ${{ github.repository }}:continuous-clearing-v$($env:GitVersion_MajorMinorPatch) + docker save ${{ github.repository }}:continuous-clearing-v$($env:GitVersion_MajorMinorPatch) -o continuous-clearing-v$($env:GitVersion_MajorMinorPatch).tar + Write-Host "::set-output name=docker-LicenseClearingTool::continuous-clearing-v$($env:GitVersion_MajorMinorPatch).tar" - name: Archive docker image #if: ${{ false }} # disable for now @@ -195,9 +195,9 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: v6.0.0 + tag_name: v$($env:GitVersion_MajorMinorPatch) #tag_name: ${{ needs.build.outputs.semver }} - release_name: Release v6.0.0 + release_name: Release v$($env:GitVersion_MajorMinorPatch) body: | ${{ github.event.head_commit.message }} draft: true From ffe3e4cb017073d99fc875e85d973f2b6711fda5 Mon Sep 17 00:00:00 2001 From: karthika Date: Thu, 25 Jan 2024 09:52:07 +0530 Subject: [PATCH 14/15] Version Updation --- CA.nuspec | 2 +- src/LCT.Common/appSettings.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CA.nuspec b/CA.nuspec index 7a5b6023..e312d916 100644 --- a/CA.nuspec +++ b/CA.nuspec @@ -4,7 +4,7 @@ continuous-clearing - 6.0.0 + 6.0.1 Siemens AG continuous-clearing contributors https://github.com/siemens/continuous-clearing diff --git a/src/LCT.Common/appSettings.json b/src/LCT.Common/appSettings.json index b9582686..19d7ad22 100644 --- a/src/LCT.Common/appSettings.json +++ b/src/LCT.Common/appSettings.json @@ -5,7 +5,7 @@ // -------------------------------------------------------------------------------------------------------------------- { - "CaVersion": "6.0.0", + "CaVersion": "6.0.1", "TimeOut": 200, "ProjectType": "", "SW360ProjectName": "", From 31d37e37579656d5913771d743948d758fe6049b Mon Sep 17 00:00:00 2001 From: karthika Date: Thu, 25 Jan 2024 09:55:51 +0530 Subject: [PATCH 15/15] Year updation --- CA.nuspec | 2 +- Dockerfile | 2 +- LICENSE | 2 +- MAINTAINERS | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CA.nuspec b/CA.nuspec index e312d916..453956ce 100644 --- a/CA.nuspec +++ b/CA.nuspec @@ -1,5 +1,5 @@ - diff --git a/Dockerfile b/Dockerfile index 2c5fe323..381cf8f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Siemens AG +# SPDX-FileCopyrightText: 2024 Siemens AG # SPDX-License-Identifier: MIT # Get parent image as latest debian patch of bullseye diff --git a/LICENSE b/LICENSE index a152215e..fb50423e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT LICENSE -Copyright (c) Siemens AG 2023 +Copyright (c) Siemens AG 2024 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/MAINTAINERS b/MAINTAINERS index bf38d37a..0f8c3f1c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Siemens AG +# SPDX-FileCopyrightText: 2024 Siemens AG # SPDX-License-Identifier: MIT Vijayalakshmi027