diff --git a/.github/workflows/project-pipeline.yml b/.github/workflows/project-pipeline.yml index 17c25d9a..0ad5871f 100644 --- a/.github/workflows/project-pipeline.yml +++ b/.github/workflows/project-pipeline.yml @@ -109,14 +109,16 @@ jobs: echo "BUILD_VERSION=${GITHUB_REF_NAME:1}" >> "$GITHUB_ENV" else echo "BUILD_TYPE=Debug" >> "$GITHUB_ENV" - echo "BUILD_VERSION=DEVBUILD" >> "$GITHUB_ENV" + echo "BUILD_VERSION=$GITHUB_REF_NAME" >> "$GITHUB_ENV" + echo "CMAKE_CXX_FLAGS='-D DEXED_ID=\"$BUILD_VERSION\"'" >> "$GITHUB_ENV" + fi echo "BUILD PARM ==========" cat $GITHUB_ENV - name: Build run: | - cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DDEXED_ID=${{ env.BUILD_VERSION }} + cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} cmake --build ${{github.workspace}}/build --config ${{ env.BUILD_TYPE }} - name: Show diff --git a/Source/Dexed.h b/Source/Dexed.h index 0a129aca..52536a3a 100644 --- a/Source/Dexed.h +++ b/Source/Dexed.h @@ -23,7 +23,9 @@ void dexed_trace(const char *source, const char *fmt, ...); -#define DEXED_ID "DEVBUILD" +#ifndef DEXED_ID + #define DEXED_ID "DEVBUILD" +#endif #ifdef DEBUG #define DEXED_VERSION DEXED_ID " DEBUG"