diff options
| author | Dan Engelbrecht <[email protected]> | 2022-06-03 23:06:09 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-06-03 23:06:09 +0200 |
| commit | b52bf436db7cbf7a4e163da94c18e3ee5024f5a7 (patch) | |
| tree | 3b9909e22066dee473ee870d81b4deaa69ec847b | |
| parent | tweak compression settings to streamline build (diff) | |
| parent | remove debug print (diff) | |
| download | zen-b52bf436db7cbf7a4e163da94c18e3ee5024f5a7.tar.xz zen-b52bf436db7cbf7a4e163da94c18e3ee5024f5a7.zip | |
Merge pull request #119 from EpicGames/de/test-git-version-tag
Pull version for GitHub action if available
| -rw-r--r-- | .github/workflows/create_release.yml | 3 | ||||
| -rw-r--r-- | xmake.lua | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index fba2ec1b1..76cc863a4 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -13,6 +13,7 @@ jobs: env: VCPKG_VERSION: 2022.03.10 + ZEN_VERSION: ${{github.ref.name}} steps: - uses: actions/checkout@v2 @@ -42,6 +43,7 @@ jobs: xmake bundle -v -y env: VCPKG_ROOT: ${{ github.workspace }}/.vcpkg + ZEN_VERSION: ${{ github.ref_name }} - name: Upload zenserver-win64 uses: actions/upload-artifact@v3 @@ -88,6 +90,7 @@ jobs: xmake bundle -v -y env: VCPKG_ROOT: ${{ github.workspace }}/.vcpkg + ZEN_VERSION: ${{ github.ref_name }} - name: Upload zenserver-linux uses: actions/upload-artifact@v3 @@ -1,7 +1,9 @@ -- Copyright Epic Games, Inc. All Rights Reserved. -set_version("0.1.1", { build = "%Y%m%d%H%M" }) set_configvar("ZEN_SCHEMA_VERSION", 3) -- changed cas oplog format (p3rl) +local zenversion = os.getenv("ZEN_VERSION") or "0.0.0" +zenversion = string.gsub(zenversion, "^v", "") +set_version(zenversion, { build = "%Y%m%d%H%M" }) add_requires( "vcpkg::asio", |