Skip to content

Commit

Permalink
CI: fix release name and patch version
Browse files Browse the repository at this point in the history
- fix `REDM_VERSION` macro
  • Loading branch information
wopox1337 committed Jun 18, 2024
1 parent bd29be7 commit b085ed0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
Expand All @@ -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:
Expand Down Expand Up @@ -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/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion cstrike/addons/amxmodx/scripting/include/redm_version.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit b085ed0

Please sign in to comment.