Embed commit hash in Workshop uploads (#2859)

* Embed commit hash in Workshop uploads * Typo * Embed directly into wirelib * Add newline * Fix Canary
wiremod · Nov 16, 2023 · f5a97e1 · f5a97e1
1 parent c83ae32
commit f5a97e1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml
@@ -11,6 +11,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@master
+
+      - name: Embed version
+        run: |
+          echo -e "\ncachedversion = \"Canary ${GITHUB_SHA:0:7}\"" >> lua/wire/server/wirelib.lua
+
       - uses: wiremod/gmod-upload@master
         with:
           id: 3066780663

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -9,10 +9,15 @@ jobs:
 
     steps:
       - uses: actions/checkout@master
+
+      - name: Embed version
+        run: |
+          echo -e "\ncachedversion = \"Workshop ${GITHUB_SHA:0:7}\"" >> lua/wire/server/wirelib.lua
+
       - uses: wiremod/gmod-upload@master
         with:
           id: 160250458
-          changelog: "Deployment via Github to latest changes"
+          changelog: "Deployment via Github to commit ${GITHUB_SHA:0:7}"
         env:
           STEAM_USERNAME: ${{ secrets.WIRETEAM_WORKSHOP_USERNAME }}
           STEAM_PASSWORD: ${{ secrets.WIRETEAM_WORKSHOP_PASSWORD }}
diff --git a/lua/wire/server/wirelib.lua b/lua/wire/server/wirelib.lua
@@ -1223,14 +1223,6 @@ function WireLib.GetVersion()
 		end
 	end
 
-	-- Check if we're Workshop version first
-	for k, addon in pairs(engine.GetAddons()) do
-		if addon.wsid == "160250458" then
-			cachedversion = "Workshop"
-			return cachedversion
-		end
-	end
-
 	if not cachedversion then cachedversion = "Unknown" end
 
 	return cachedversion