new versioning

Official-Husko · Apr 7, 2024 · 56daf3c · 56daf3c
1 parent 3f93236
commit 56daf3c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/all_os.yml b/.github/workflows/all_os.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: patched_linux_asar
+          name: linux
           path: ./apps/desktop/release/linux-unpacked/resources/app.asar
 
   build_and_deploy_macos:
@@ -74,7 +74,7 @@ jobs:
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: patched_mac_artifacts
+          name: mac
           path: ./apps/desktop/release/mac-universal/GDLauncher.app/Contents/Resources/app.asar
 
   build_and_deploy_windows:
@@ -104,6 +104,6 @@ jobs:
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: patched_win_asar
+          name: windows
           path: ./apps/desktop/release/win-unpacked/resources/app.asar
 
diff --git a/packages/config/src/appVersion.ts b/packages/config/src/appVersion.ts
@@ -1,13 +1,13 @@
 import fs from "fs";
 import path from "path";
 import { execSync } from "child_process";
-const gitCommitDate = execSync("git log -1 --format=%ct").toString().trim();
+const gitCommitDate = execSync("git log -1 --format=%h --abbrev=7").toString().trim();
 
 const VERSION_JSON = JSON.parse(
   fs.readFileSync(path.resolve(__dirname, "../", "version.json")).toString()
 );
 const channel = VERSION_JSON.channel
-  ? "-" + VERSION_JSON.channel + "." + gitCommitDate
+  ? "-" + VERSION_JSON.channel + " (" + gitCommitDate + ")"
   : "";
 
 const version = VERSION_JSON.version;

diff --git a/packages/config/version.json b/packages/config/version.json
@@ -1,4 +1,4 @@
 {
-  "version": "2.0.99",
-  "channel": "beta"
+  "version": "2.0.6",
+  "channel": "adless"
 }