Merge pull request #69 from layer5io/update-academy-theme-fix

start tracking module version

Author: aabidsofi19

.github/workflows/build-and-release.yml

@@ -41,7 +41,7 @@ jobs:
         run: |
           ORG_ID="${{ github.event.inputs.orgId }}"
           VERSION="${{ github.event.inputs.version || 'latest' }}"
-          MODULE=$(jq -r --arg orgId "$ORG_ID" '.orgToModuleMapping[$orgId]' academy_config.json)
+          MODULE=$(jq -r --arg orgId "$ORG_ID" '.orgToModuleMapping[$orgId].module' academy_config.json)
 
           if [ "$MODULE" = "null" ] || [ -z "$MODULE" ]; then
             echo "❌ Module not found for orgId: $ORG_ID"
@@ -50,6 +50,7 @@ jobs:
 
           echo "✅ Found module for orgId '$ORG_ID': $MODULE"
           make update-module  module="$MODULE" version="$VERSION"
+          make update-org-to-module-version orgId="$ORG_ID" version="$VERSION"
 
       - name: Install dependencies
         run: make setup
@@ -81,6 +82,7 @@ jobs:
           rm -rf meshery-cloud/academy
           mkdir -p meshery-cloud/academy
           rsync -av --delete public/ meshery-cloud/academy/
+          cp  academy_config.json meshery-cloud/academy/
 
       - name: Commit & push academy to meshery-cloud
         uses: stefanzweifel/git-auto-commit-action@v5

Makefile

@@ -18,7 +18,7 @@ include .github/build/Makefile-show-help.mk
 #----------------------------------------------------------------------------
 # Academy
 # ---------------------------------------------------------------------------
-.PHONY: setup build stg-build prod-build theme-update sync-with-cloud site
+.PHONY: setup build stg-build prod-build theme-update sync-with-cloud site check-go update-module update-org-to-module-version
 
 ## ------------------------------------------------------------
 ----LOCAL_BUILDS: Show help for available targets
@@ -70,10 +70,22 @@ update-module:
 	echo "Updating Hugo module: $(module) to version $(version)" && \
 	hugo mod get $(module)@$(version)
 
+update-org-to-module-version:
+	@if [ -z "$(orgId)" ] || [ -z "$(version)" ]; then \
+		echo "Usage: make update-org-to-module-mapping orgId=<org-id> version=<version>"; \
+		exit 1; \
+	fi && \
+	jq --arg orgId "$(orgId)" --arg version "$(version)" \
+	'.orgToModuleMapping[$$orgId].version = $$version' \
+	academy_config.json > tmp.json && mv tmp.json academy_config.json
+
+
 ## Publish Academy build to Layer5 Cloud.
 ## Copy built site from public/ to 
 ## ../meshery-cloud/academy directory
 sync-with-cloud:
 	rm -rf ../meshery-cloud/academy
 	mkdir -p ../meshery-cloud/academy
-	rsync -av --delete public/ ../meshery-cloud/academy/
+	rsync -av --delete public/ ../meshery-cloud/academy/ 
+	cp academy_config.json ../meshery-cloud/academy/
+	@echo "Academy site synced with Layer5 Cloud." 

academy_config.json

@@ -1,7 +1,17 @@
 {
-  "orgToModuleMapping":{
-    "27e21312-1e0c-4b2b-a045-95fcde425f09": "github.com/aabidsofi19/aabids-academy",
-    "98e16360-a366-4b78-8e0a-031da07fdacb" : "github.com/layer5io/exoscale-academy",
-    "11111111-1111-1111-1111-111111111111": "github.com/layer5io/layer5-academy"
+  "orgToModuleMapping": {
+    "27e21312-1e0c-4b2b-a045-95fcde425f09": {
+      "module": "github.com/aabidsofi19/aabids-academy",
+      "version": "v1.2"
+    },
+    "98e16360-a366-4b78-8e0a-031da07fdacb": {
+      "module": "github.com/layer5io/exoscale-academy",
+      "version": "v4.6"
+    },
+    "11111111-1111-1111-1111-111111111111": {
+      "module": "github.com/layer5io/layer5-academy",
+      "version": "v2.5"
+    }
+    
   }
 }