From 0721c0d7d4fea280c05a448332c80fc6bb628c0d Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Sat, 8 Oct 2022 18:34:38 +0100
Subject: [PATCH] Strip meta from sem version

---
 .github/workflows/docker-build.yml | 3 +--
 .gitlab/docker-build.yml           | 6 ++----
 app/classes/shared/helpers.py      | 3 +--
 app/config/version.json            | 3 +--
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index b2efb520..20fe20f9 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -58,8 +58,7 @@ jobs:
           MAJOR=$(cat app/config/version.json | jq '.major' )
           MINOR=$(cat app/config/version.json | jq '.minor' )
           SUB=$(cat app/config/version.json | jq '.sub' )
-          META=$(cat app/config/version.json | jq -r '.meta' )
-          echo "::set-output name=version::$MAJOR.$MINOR.$SUB-$META"
+          echo "::set-output name=version::$MAJOR.$MINOR.$SUB"
 
       - name: Get branch tag
         id: branch
diff --git a/.gitlab/docker-build.yml b/.gitlab/docker-build.yml
index 49725030..5cd4233a 100644
--- a/.gitlab/docker-build.yml
+++ b/.gitlab/docker-build.yml
@@ -17,7 +17,6 @@ docker-build-dev:
       MAJOR=$(cat app/config/version.json | jq '.major' )
       MINOR=$(cat app/config/version.json | jq '.minor' )
       SUB=$(cat app/config/version.json | jq '.sub' )
-      META=$(cat app/config/version.json | jq -r '.meta' )
     - |
       apk --no-cache add curl
       latest_tag=$(curl -s https://api.github.com/repos/docker/buildx/releases/latest | sed -Ene '/^ *"tag_name": *"(v.+)",$/s//\1/p')
@@ -33,7 +32,7 @@ docker-build-dev:
   script:
     - |
       tag=":$CI_COMMIT_REF_SLUG"
-      VERSION="${MAJOR}.${MINOR}.${SUB}-${META}"
+      VERSION="${MAJOR}.${MINOR}.${SUB}"
     - |
       echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
       echo "Crafty Version: $VERSION"
@@ -72,7 +71,6 @@ docker-build-prod:
       MAJOR=$(cat app/config/version.json | jq '.major' )
       MINOR=$(cat app/config/version.json | jq '.minor' )
       SUB=$(cat app/config/version.json | jq '.sub' )
-      META=$(cat app/config/version.json | jq -r '.meta' )
     - |
       apk --no-cache add curl
       latest_tag=$(curl -s https://api.github.com/repos/docker/buildx/releases/latest | sed -Ene '/^ *"tag_name": *"(v.+)",$/s//\1/p')
@@ -88,7 +86,7 @@ docker-build-prod:
   script:
     - |
       tag=""
-      VERSION="${MAJOR}.${MINOR}.${SUB}-${META}"
+      VERSION="${MAJOR}.${MINOR}.${SUB}"
     - |
       echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
       echo "Crafty Version: $VERSION"
diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index 06779dc7..c4d9ad10 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -450,10 +450,9 @@ class Helpers:
         major = version_data.get("major", "?")
         minor = version_data.get("minor", "?")
         sub = version_data.get("sub", "?")
-        meta = version_data.get("meta", "?")
 
         # set some defaults if we don't get version_data from our helper
-        version = f"{major}.{minor}.{sub}-{meta}"
+        version = f"{major}.{minor}.{sub}"
         return str(version)
 
     def encode_pass(self, password):
diff --git a/app/config/version.json b/app/config/version.json
index a3b99705..2dece081 100644
--- a/app/config/version.json
+++ b/app/config/version.json
@@ -1,6 +1,5 @@
 {
   "major": 4,
   "minor": 0,
-  "sub": 16,
-  "meta": "beta"
+  "sub": 16
 }