diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 45de8d4..3ed2c8b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest outputs: COMMIT_SHA: ${{ steps.declare_sha.outputs.COMMIT_SHA }} - SEMVER_PATCH: ${{ steps.declare_sha.outputs.SEMVER }} + FULLVERSION: ${{ steps.semver_parser.outputs.fullversion }} steps: - name: Checkout uses: actions/checkout@v4.1.1 @@ -41,7 +41,7 @@ jobs: run: | SHA=$(git rev-parse --short HEAD) echo "COMMIT_SHA=$SHA" >> $GITHUB_OUTPUT - echo "SEMVER_PATCH=${{ steps.semver_parser.outputs.patch }}.${{ steps.semver_parser.outputs.prerelease }}" >> $GITHUB_OUTPUT + echo "SEMVER_PATCH=${{ steps.semver_parser.outputs.patch }}-${{ steps.semver_parser.outputs.prerelease }}" >> $GITHUB_OUTPUT - name: Setup latest ReAPI includes env: @@ -130,7 +130,7 @@ jobs: - name: Packaging binaries id: packaging - run: 7z a -mm=Deflate -mfb=258 -mpass=15 -r ReDeathmatch-${{ needs.build.outputs.SEMVER_PATCH }}.zip cstrike/ + run: 7z a -mm=Deflate -mfb=258 -mpass=15 -r ReDeathmatch-${{ needs.build.outputs.FULLVERSION }}.zip cstrike/ - name: Publish artifacts uses: softprops/action-gh-release@v2.0.4 diff --git a/cstrike/addons/amxmodx/scripting/include/redm_version.inc b/cstrike/addons/amxmodx/scripting/include/redm_version.inc index 13c171f..5bcf40d 100644 --- a/cstrike/addons/amxmodx/scripting/include/redm_version.inc +++ b/cstrike/addons/amxmodx/scripting/include/redm_version.inc @@ -8,4 +8,4 @@ #define REDM_VERSION_MINOR 0 #define REDM_VERSION_PATCH "manual" -#define REDM_VERSION fmt("%i.%i." + REDM_VERSION_PATCH, REDM_VERSION_MAJOR, REDM_VERSION_MINOR) +#define REDM_VERSION fmt("%i.%i.%s", REDM_VERSION_MAJOR, REDM_VERSION_MINOR, REDM_VERSION_PATCH)