diff --git a/.github/actions/make-version-string/action.yml b/.github/actions/make-version-string/action.yml index 6acbafd..361f714 100644 --- a/.github/actions/make-version-string/action.yml +++ b/.github/actions/make-version-string/action.yml @@ -4,6 +4,9 @@ inputs: assemblyInfoPath: description: 'Path to a .NET style AssemblyInfo file containing the numeric version component.' required: true + primaryBranch: + description: 'Name of the primary branch, the one that is published without any version string prefix.' + default: 'master' outputs: versionstring: description: 'The generated version string' diff --git a/.github/actions/make-version-string/entrypoint.ps1 b/.github/actions/make-version-string/entrypoint.ps1 index 518394d..e5a9ac7 100644 --- a/.github/actions/make-version-string/entrypoint.ps1 +++ b/.github/actions/make-version-string/entrypoint.ps1 @@ -4,5 +4,5 @@ Import-Module Axinom.DevOpsTooling $path = Join-Path $env:GITHUB_WORKSPACE $env:INPUT_ASSEMBLYINFOPATH -$version = Set-DotNetBuildAndVersionStrings -assemblyInfoPath $path -commitId $ENV:GITHUB_SHA +$version = Set-DotNetBuildAndVersionStrings -assemblyInfoPath $path -commitId $ENV:GITHUB_SHA -primaryBranchName $env:INPUT_PRIMARYBRANCH Write-Host "::set-output name=versionstring::$version" \ No newline at end of file diff --git a/.github/workflows/push-to-publish-latest.yml b/.github/workflows/push-to-latest.yml similarity index 91% rename from .github/workflows/push-to-publish-latest.yml rename to .github/workflows/push-to-latest.yml index bea5f2d..0adbeb1 100644 --- a/.github/workflows/push-to-publish-latest.yml +++ b/.github/workflows/push-to-latest.yml @@ -1,6 +1,6 @@ on: push: - branches: ['publish-latest'] + branches: ['latest'] jobs: build: runs-on: ubuntu-latest @@ -10,6 +10,7 @@ jobs: uses: ./.github/actions/make-version-string with: assemblyInfoPath: AssemblyInfo.cs + primaryBranch: 'latest' - uses: ./.github/actions/expand-tokens env: VERSIONSTRING: ${{ steps.make_version_string.outputs.versionstring }} diff --git a/.github/workflows/push-to-master.yml b/.github/workflows/push-to-master.yml index 4f6f180..a1d0032 100644 --- a/.github/workflows/push-to-master.yml +++ b/.github/workflows/push-to-master.yml @@ -10,6 +10,7 @@ jobs: uses: ./.github/actions/make-version-string with: assemblyInfoPath: AssemblyInfo.cs + primaryBranch: 'latest' - uses: ./.github/actions/expand-tokens env: VERSIONSTRING: ${{ steps.make_version_string.outputs.versionstring }}