Skip to content

Commit

Permalink
Github Actions, switching to GITHUB_RUN_NUMBER for Preview build, att…
Browse files Browse the repository at this point in the history
…empt 06... Next Fix token expiration ... Later deep dive into folder cmdlets based on OpenApi
  • Loading branch information
ddemeyer committed Sep 29, 2023
1 parent ae4ef82 commit 5d5b5d6
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
branches: [ master ]

env:
ISHGITHUB_RUN_ATTEMPT: ${{ github.run_attempt }}
ISHGITHUB_RUN_NUMBER: ${{ github.run_number }}

jobs:
build:
Expand All @@ -33,7 +33,7 @@ jobs:
echo "GITHUB_WORKFLOW[$env:GITHUB_WORKFLOW]"
echo "GITHUB_RUN_NUMBER[$env:GITHUB_RUN_NUMBER]"
echo "GITHUB_RUN_ATTEMPT[$env:GITHUB_RUN_ATTEMPT]"
echo "ISHGITHUB_RUN_ATTEMPT[$env:ISHGITHUB_RUN_ATTEMPT]"
echo "ISHGITHUB_RUN_NUMBER[$env:ISHGITHUB_RUN_NUMBER]"
- uses: actions/checkout@v3

Expand Down
12 changes: 6 additions & 6 deletions Source/ISHRemote/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
<VersionMinor>0</VersionMinor>
<VersionPatch>0</VersionPatch>
<VersionBuild>$([MSBuild]::Add($([MSBuild]::Multiply(1200, $([MSBuild]::Subtract($([System.DateTime]::UtcNow.Year), 2015)))), $([MSBuild]::Add($([MSBuild]::Multiply(100, $([System.DateTime]::UtcNow.Month))),$([System.DateTime]::UtcNow.Day)))))</VersionBuild>
<VersionSuffix Condition="'$(ISHGITHUB_RUN_ATTEMPT)' == ''">localpreview-$(VersionMajor).0</VersionSuffix>
<VersionSuffix Condition="'$(ISHGITHUB_RUN_ATTEMPT)' != ''">cipreview-$(VersionMajor).$(ISHGITHUB_RUN_ATTEMPT)</VersionSuffix>
<VersionSuffix Condition="'$(ISHGITHUB_RUN_NUMBER)' == ''">localpreview-$(VersionMajor).0</VersionSuffix>
<VersionSuffix Condition="'$(ISHGITHUB_RUN_NUMBER)' != ''">cipreview-$(VersionMajor).$(ISHGITHUB_RUN_NUMBER)</VersionSuffix>

<AssemblyVersion>$(VersionMajor).0.0.0</AssemblyVersion>
<FileVersion Condition="'$(ISHGITHUB_RUN_ATTEMPT)' == ''">$(VersionMajor).$(VersionMinor).$(VersionBuild).0</FileVersion>
<FileVersion Condition="'$(ISHGITHUB_RUN_ATTEMPT)' != ''">$(VersionMajor).$(VersionMinor).$(VersionBuild).$(ISHGITHUB_RUN_ATTEMPT)</FileVersion>
<FileVersion Condition="'$(ISHGITHUB_RUN_NUMBER)' == ''">$(VersionMajor).$(VersionMinor).$(VersionBuild).0</FileVersion>
<FileVersion Condition="'$(ISHGITHUB_RUN_NUMBER)' != ''">$(VersionMajor).$(VersionMinor).$(VersionBuild).$(ISHGITHUB_RUN_NUMBER)</FileVersion>
<InformationalVersion>$(FileVersion)-$(VersionSuffix)</InformationalVersion>

<PackageVersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</PackageVersionPrefix>
Expand All @@ -39,8 +39,8 @@
<Build>$([MSBuild]::Add($([MSBuild]::Multiply(1200, $([MSBuild]::Subtract($([System.DateTime]::UtcNow.Year), 2015)))), $([MSBuild]::Add($([MSBuild]::Multiply(100, $([System.DateTime]::UtcNow.Month))),$([System.DateTime]::UtcNow.Day)))))</Build>
<ModuleVersion>$(Major).$(Minor).$(Patch)</ModuleVersion>
<ModuleBuildVersion>$(Major).$(Minor).$(Build).$(Patch)</ModuleBuildVersion>
<Prerelease Condition="'$(ISHGITHUB_RUN_ATTEMPT)' == ''">preview002</Prerelease>
<Prerelease Condition="'$(ISHGITHUB_RUN_ATTEMPT)' != ''">preview$([System.String]::Format('{0:D3}', $([System.UInt16]::Parse($(ISHGITHUB_RUN_ATTEMPT)))))</Prerelease>
<Prerelease Condition="'$(ISHGITHUB_RUN_NUMBER)' == ''">preview002</Prerelease>
<Prerelease Condition="'$(ISHGITHUB_RUN_NUMBER)' != ''">preview$([System.String]::Format('{0:D3}', $([System.UInt16]::Parse($(ISHGITHUB_RUN_NUMBER)))))</Prerelease>
<ModuleName>$(ProductName)</ModuleName>
<ModuleTitle>Tridion Docs Content Manager $(ProductName)</ModuleTitle>
<ModuleDescription>Business automation module on top of Tridion Docs Content Manager (Knowledge Center Content Manager, LiveContent Architect, Trisoft InfoShare)</ModuleDescription>
Expand Down

0 comments on commit 5d5b5d6

Please sign in to comment.