From 88938a3a14c1a30224fc72fd7b22424b18510685 Mon Sep 17 00:00:00 2001
From: Dan Engelbrecht <dan.engelbrecht@epicgames.com>
Date: Thu, 2 Jun 2022 10:51:44 +0200
Subject: pick up version number from env variable set by github

---
 .github/workflows/create_release.yml | 2 ++
 xmake.lua                            | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
index fba2ec1b1..768b3d980 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
@@ -54,6 +55,7 @@ jobs:
 
     env:
       VCPKG_VERSION: 2022.03.10
+      ZEN_VERSION: ${{github.ref.name}}
 
     steps:
     - uses: actions/checkout@v2
diff --git a/xmake.lua b/xmake.lua
index 9ffc94c65..210e64c0f 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -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 "<dev>"
+zenversion = string.gsub(zenversion, "^v", "")
+set_version(zenversion, { build = "%Y%m%d%H%M" })
 
 add_requires(
     "vcpkg::asio",
-- 
cgit v1.2.3


From e9a1dadf8a511f4a63b41bc3206321d261a2bb1f Mon Sep 17 00:00:00 2001
From: Dan Engelbrecht <dan.engelbrecht@epicgames.com>
Date: Thu, 2 Jun 2022 10:52:32 +0200
Subject: add debug print for now

---
 xmake.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xmake.lua b/xmake.lua
index 210e64c0f..b754e34c0 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -4,6 +4,7 @@ set_configvar("ZEN_SCHEMA_VERSION", 3) -- changed cas oplog format (p3rl)
 local zenversion = os.getenv("ZEN_VERSION") or "<dev>"
 zenversion = string.gsub(zenversion, "^v", "")
 set_version(zenversion, { build = "%Y%m%d%H%M" })
+print(zenversion)
 
 add_requires(
     "vcpkg::asio",
-- 
cgit v1.2.3


From 63ff8e0120a52d7c1c236e3e9f9b3afed62a9aac Mon Sep 17 00:00:00 2001
From: Dan Engelbrecht <dan.engelbrecht@epicgames.com>
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 "<dev>"
+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


From 8b482be3cdbb2943d9e7600937cb801008d51475 Mon Sep 17 00:00:00 2001
From: Dan Engelbrecht <dan.engelbrecht@epicgames.com>
Date: Thu, 2 Jun 2022 10:59:53 +0200
Subject: remove debug print

---
 xmake.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/xmake.lua b/xmake.lua
index 1df16efe4..a4750a1d1 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -4,7 +4,6 @@ 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" })
-print(zenversion)
 
 add_requires(
     "vcpkg::asio",
-- 
cgit v1.2.3