From 63ff8e0120a52d7c1c236e3e9f9b3afed62a9aac Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Thu, 2 Jun 2022 10:58:04 +0200 Subject: move env --- .github/workflows/create_release.yml | 3 ++- xmake.lua | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 768b3d980..76cc863a4 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -43,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 @@ -55,7 +56,6 @@ jobs: env: VCPKG_VERSION: 2022.03.10 - ZEN_VERSION: ${{github.ref.name}} steps: - uses: actions/checkout@v2 @@ -90,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 diff --git a/xmake.lua b/xmake.lua index b754e34c0..1df16efe4 100644 --- a/xmake.lua +++ b/xmake.lua @@ -1,7 +1,7 @@ -- Copyright Epic Games, Inc. All Rights Reserved. set_configvar("ZEN_SCHEMA_VERSION", 3) -- changed cas oplog format (p3rl) -local zenversion = os.getenv("ZEN_VERSION") or "" +local zenversion = os.getenv("ZEN_VERSION") or "0.0.0" zenversion = string.gsub(zenversion, "^v", "") set_version(zenversion, { build = "%Y%m%d%H%M" }) print(zenversion) -- cgit v1.2.3