Skip to content

Commit

Permalink
Merge pull request #119 from siemens/development
Browse files Browse the repository at this point in the history
Release Version Change
  • Loading branch information
karthika-g committed Jan 30, 2024
2 parents d0aa8cb + 5ad9359 commit ba44628
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
21 changes: 11 additions & 10 deletions .github/workflows/compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Setup Version
uses: gittools/actions/gitversion/[email protected]
with:
versionSpec: '5.5.0'
versionSpec: '5.12.0'
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: TRUE

Expand All @@ -39,7 +39,8 @@ jobs:
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: TRUE

- name: get SemVer
- name: get SemVer
if: ${{ false }} # disable for now
id: gitversion
run: |
echo "SemVer: v$($env:GitVersion_SemVer)"
Expand Down Expand Up @@ -94,7 +95,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-v$($env:GitVersion_MajorMinorPatch).zip"
$fileName = "continuous-clearing-v6.0.1.zip"
Write-Host "Filename: '$fileName'"
Write-Host "sourceFolder: '$sourceFolder'"
Write-Host "Outfolder: '$outFolder'"
Expand Down Expand Up @@ -138,8 +139,8 @@ jobs:
- name: Create Nuget Packages
id: createNupkg
run: |
nuget pack CA.nuspec -Version $($env:GitVersion_MajorMinorPatch)
Write-Host "::set-output name=nupkg-LicenseClearingTool::continuous-clearing.$($env:GitVersion_MajorMinorPatch).nupkg"
nuget pack CA.nuspec -Version 6.0.1
Write-Host "::set-output name=nupkg-LicenseClearingTool::continuous-clearing.6.0.1.nupkg"
- name: Archive NuGet Packages
uses: actions/upload-artifact@v2
Expand All @@ -152,9 +153,9 @@ jobs:
id: builddocker
#if: ${{ false }} # disable for now
run: |
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"
docker build . --file Dockerfile --tag ${{ github.repository }}:continuous-clearing-v6.0.1
docker save ${{ github.repository }}:continuous-clearing-v6.0.1 -o continuous-clearing-v6.0.1.tar
Write-Host "::set-output name=docker-LicenseClearingTool::continuous-clearing-v6.0.1.tar"
- name: Archive docker image
#if: ${{ false }} # disable for now
Expand Down Expand Up @@ -195,8 +196,8 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: v${{ needs.build.outputs.semver }}
release_name: Release v${{ needs.build.outputs.semver }}
tag_name: v6.0.1
release_name: Release v6.0.1
body: |
${{ github.event.head_commit.message }}
draft: true
Expand Down
3 changes: 1 addition & 2 deletions GitVersion.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
mode: Mainline
next-version: 3.1.0
branches:
master:
regex: ^master$|^main$
ignore:
sha: [408943429d1788227ad19ef6434d1fb44257263c, 51eaa765411149f8411676ed421b6274b38aeb4b]
sha: [408943429d1788227ad19ef6434d1fb44257263c, 51eaa765411149f8411676ed421b6274b38aeb4b,d0aa8cbdab2a03b0cb34eda9022e8ffd87655260]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ This tool has been logically split into 3 different executables that enable it

# 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).
The Continuous Clearing Tool incorporates SEPP tool functionalities, seamlessly integrated into the Artifactory uploader.
This integration ensures
- Software License Clearing is done.
- No pre-release versions of re-use components are used.
Expand Down

0 comments on commit ba44628

Please sign in to comment.