Skip to content

Commit d668cf2

Browse files
committed
Testing rc version.
1 parent d7b40d0 commit d668cf2

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

.github/workflows/ManualRelease.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,14 @@ jobs:
9292
- name: Build Native Library
9393
uses: Squirrelies/CI-CD/BuildMSYS2CMakeVCPkgProject@main
9494
id: build-native-library
95+
env:
96+
RC_VERSION: ${{steps.Get-SemVer.outputs.Version}}
97+
RC_VERSION_MAJOR: ${{steps.Get-Version.outputs.VersionMajor}}
98+
RC_VERSION_MINOR: ${{steps.Get-Version.outputs.VersionMinor}}
99+
RC_VERSION_PATCH: ${{steps.Get-Version.outputs.VersionPatch}}
100+
RC_VERSION_BUILD: ${{steps.Get-Version.outputs.VersionBuild}}
101+
RC_VERSION_PRERELEASE_TAG: ${{steps.Get-Version.outputs.VersionPreRelease}}
102+
RC_VERSION_BUILD_HASH: ${{steps.Get-Version.outputs.VersionCommitHash}}
95103
with:
96104
root-path: ./src/ProcessMemoryNative
97105
msys2-msystem: ${{ matrix.BUILD_PLATFORM == 'x64' && 'clang64' || 'mingw32' }}
@@ -100,7 +108,7 @@ jobs:
100108
preset-configuration: ${{inputs.buildConfig}}
101109
preset-configuration-tidy: ${{ inputs.runLinters == true && format('{0}-Tidy', inputs.buildConfig) || ''}}
102110
run-unit-tests: ${{inputs.unitTests}}
103-
additional-cmake-args: -DARCH=${{matrix.BUILD_PLATFORM}} -DRC_VERSION_MAJOR=${{steps.Get-Version.outputs.VersionMajor}} -DRC_VERSION_MINOR=${{steps.Get-Version.outputs.VersionMinor}} -DRC_VERSION_PATCH=${{steps.Get-Version.outputs.VersionPatch}} -DRC_VERSION_BUILD=${{steps.Get-Version.outputs.VersionBuild}} -DRC_VERSION_PRERELEASE_TAG=${{steps.Get-Version.outputs.VersionPreRelease}} -DRC_VERSION_BUILD_HASH=${{steps.Get-Version.outputs.VersionCommitHash}}
111+
additional-cmake-args: -DARCH=${{matrix.BUILD_PLATFORM}} -DRC_VERSION=${{steps.Get-SemVer.outputs.Version}} -DRC_VERSION_MAJOR=${{steps.Get-Version.outputs.VersionMajor}} -DRC_VERSION_MINOR=${{steps.Get-Version.outputs.VersionMinor}} -DRC_VERSION_PATCH=${{steps.Get-Version.outputs.VersionPatch}} -DRC_VERSION_BUILD=${{steps.Get-Version.outputs.VersionBuild}} -DRC_VERSION_PRERELEASE_TAG=${{steps.Get-Version.outputs.VersionPreRelease}} -DRC_VERSION_BUILD_HASH=${{steps.Get-Version.outputs.VersionCommitHash}}
104112

105113
- name: Setup NuGet
106114
uses: NuGet/setup-nuget@v2

src/ProcessMemoryNative/src/VersionInfo.rc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#define VER_FILEVERSION_STR "@RC_VERSION_MAJOR@.@RC_VERSION_MINOR@.@RC_VERSION_PATCH@.@RC_VERSION_BUILD@\0"
1414

1515
#define VER_PRODUCTVERSION @RC_VERSION_MAJOR@,@RC_VERSION_MINOR@,@RC_VERSION_PATCH@,@RC_VERSION_BUILD@
16-
#define VER_PRODUCTVERSION_STR "@RC_VERSION_MAJOR@.@RC_VERSION_MINOR@.@RC_VERSION_PATCH@ (Build #@RC_VERSION_BUILD@)\0"
16+
#define VER_PRODUCTVERSION_STR "@RC_VERSION@\0"
1717

1818
#define VER_PRIVATEBUILD 0
1919
#define VER_PRERELEASE 0

0 commit comments

Comments
 (0)