Merge branch 'master' into feat/academy-update

Signed-off-by: Lee Calcote <[email protected]>

Author: leecalcote

.github/build/Makefile-show-help.mk

@@ -1,5 +1,35 @@
 .DEFAULT_GOAL := show-help
 # See <https://gist.github.com/klmr/575726c7e05d8780505a> for explanation.
+# Modified to support multi-line comments and preserve target order
 .PHONY: show-help
 show-help:
-	@echo "$$(tput bold)Please specify a build target. The choices are:$$(tput sgr0)";echo;sed -ne"/^## /{h;s/.*//;:d" -e"H;n;s/^## //;td" -e"s/:.*//;G;s/\\n## /---/;s/\\n/ /g;p;}" ${MAKEFILE_LIST}|LC_ALL='C' sort -f|awk -F --- -v n=$$(tput cols) -v i=19 -v a="$$(tput setaf 6)" -v z="$$(tput sgr0)" '{printf"%s%*s%s ",a,-i,$$1,z;m=split($$2,w," ");l=n-i;for(j=1;j<=m;j++){l-=length(w[j])+1;if(l<= 0){l=n-i-length(w[j])-1;printf"\n%*s ",-i," ";}printf"%s ",w[j];}printf"\n";}'|more $(shell test $(shell uname) == Darwin && echo '-Xr')
+	@echo "$$(tput bold)Please specify a build target. The choices are:$$(tput sgr0)";echo; \
+	awk ' \
+	/^##/ { \
+		gsub(/^## ?/, ""); \
+		if (buffer == "") buffer = $$0; \
+		else buffer = buffer " " $$0; \
+		next; \
+	} \
+	/^[a-zA-Z_-]+:/ && $$0 !~ /:=/ && $$0 !~ /^\\./ { \
+		split($$0, parts, ":"); \
+		target = parts[1]; \
+		if (target != "" && target !~ /^\./ && !(target in seen)) { \
+			if (buffer != "") { \
+				targets[++count] = target; \
+				comments[target] = buffer; \
+				seen[target] = 1; \
+			} \
+			buffer = ""; \
+		} \
+	} \
+	!/^##/ && !/^[a-zA-Z_-]+:/ { \
+		buffer = ""; \
+	} \
+	END { \
+		for (i = 1; i <= count; i++) { \
+			target = targets[i]; \
+			comment = comments[target]; \
+			printf "\033[36m%-19s\033[0m %s\n", target, comment; \
+		} \
+	}' ${MAKEFILE_LIST}

.github/build/Makefile.core.mk

@@ -54,9 +54,7 @@ EXOSCALE_DEV="https://dev-sks.exoscale.com"
 #-----------------------------------------------------------------------------
 # Server
 #-----------------------------------------------------------------------------
-MESHERY_K8S_SKIP_COMP_GEN ?= TRUE
-APPLICATIONCONFIGPATH="./apps.json"
-PORT:=9081
+PORT:=1313
 
 #-----------------------------------------------------------------------------
 # Build

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

@@ -50,13 +50,13 @@ jobs:
           fi
 
           echo "✅ Found module for orgId '$ORG_ID': $MODULE"
-          make update-module module="$MODULE" version="$VERSION"
+          make theme-update module="$MODULE" version="$VERSION"
 
       - name: Install dependencies
-        run: make academy-setup
+        run: make setup
 
       - name: Build Academy
-        run: make academy-prod
+        run: make prod-build
 
       # - name: Pull changes from self master
       #   run: git pull origin master

Dockerfile

@@ -19,5 +19,5 @@ RUN hugo version && go version && node -v && npm -v
 COPY . .
 
 # Build Academy pages
-RUN make academy-setup
-RUN make academy-prod
+RUN make setup
+RUN make prod-build

Makefile

@@ -18,44 +18,47 @@ include .github/build/Makefile-show-help.mk
 #----------------------------------------------------------------------------
 # Academy
 # ---------------------------------------------------------------------------
-.PHONY: academy-setup academy-dev academy-staging academy-prod update-module academy-update
+.PHONY: setup build stg-build prod-build theme-update sync-with-cloud site
 
-## Install site dependencies
-academy-setup:
+## ------------------------------------------------------------
+----LOCAL_BUILDS: Show help for available targets
+	
+## Local: Install site dependencies
+setup:
 	 npm i
 
-## Build site using Layer5 Cloud as the baseURL
-academy-prod:
-	 hugo  --cleanDestinationDir --gc --minify --baseURL "https://cloud.layer5.io/academy"
+## Local: Build site for local consumption
+build:
+	hugo build
+
+## Local: Build and run site locally
+site:
+	hugo serve
+
+## ------------------------------------------------------------
+----REMOTE_BUILDS: Show help for available targets
 
 ## Build site using Layer5 Cloud Staging as the baseURL
-academy-staging:
+stg-build:
 	 hugo --cleanDestinationDir --gc --minify --baseURL "https://staging-cloud.layer5.io/academy"
 
-## Build site for local consumption
-academy-dev:
-	hugo build
+## Build site using Layer5 Cloud as the baseURL
+prod-build:
+	 hugo  --cleanDestinationDir --gc --minify --baseURL "https://cloud.layer5.io/academy"
 
-## Build and run site locally
-academy-dev-live:
-	hugo serve
 
-## Upgrade site's theme to latest version
-## Change to "theme-upgrade"
-update-module:
-	@if [ -z "$(module)" ] || [ -z "$(version)" ]; then \
-		echo "Usage: make update-module module=<module-path> version=<version>"; \
-		exit 1; \
-	fi && \
-	echo "Updating Hugo module: $(module) to version $(version)" && \
-	hugo mod get $(module)@$(version)
-
-## Publish Academy build to Layer5 Cloud
+## ------------------------------------------------------------
+----MAINTENANCE: Show help for available targets
+
+## Update the academy-theme package to latest version
+theme-update:
+	echo "Updating to latest academy-theme..." && \
+	hugo mod get -u
+
+## 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/
-
-## Update the academy-theme package to latest version
-academy-update:
-	hugo mod get -u
+	rsync -av --delete public/ ../meshery-cloud/academy/

go.mod

@@ -1,12 +1,12 @@
 module github.com/layer5io/academy
 
-go 1.12
+go 1.24.5
 
 require (
 	github.com/FortAwesome/Font-Awesome v0.0.0-20241216213156-af620534bfc3 // indirect
 	github.com/google/docsy v0.12.0 // indirect
-	github.com/layer5io/academy-theme v0.1.15 // indirect
-	github.com/layer5io/exoscale-academy v0.3.2 // indirect
-	github.com/layer5io/layer5-academy v0.1.7 // indirect
+	github.com/layer5io/academy-theme v0.1.19 // indirect
+	github.com/layer5io/exoscale-academy v0.3.7 // indirect
+	github.com/layer5io/layer5-academy v0.1.10 // indirect
 	github.com/twbs/bootstrap v5.3.7+incompatible // indirect
 )

go.sum

@@ -1,17 +1,17 @@
 github.com/FortAwesome/Font-Awesome v0.0.0-20241216213156-af620534bfc3 h1:/iluJkJiyTAdnqrw3Yi9rH2HNHhrrtCmj8VJe7I6o3w=
 github.com/FortAwesome/Font-Awesome v0.0.0-20241216213156-af620534bfc3/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
+github.com/FortAwesome/Font-Awesome v4.7.0+incompatible h1:3trjm7NtX5NXlju1AxSWSzedDMq2hsfH78Qtqrc8EgY=
+github.com/FortAwesome/Font-Awesome v4.7.0+incompatible/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
 github.com/google/docsy v0.12.0 h1:CddZKL39YyJzawr8GTVaakvcUTCJRAAYdz7W0qfZ2P4=
 github.com/google/docsy v0.12.0/go.mod h1:1bioDqA493neyFesaTvQ9reV0V2vYy+xUAnlnz7+miM=
-github.com/layer5io/academy-theme v0.1.10/go.mod h1:kAidN16xIX6Dx2TBz7y0u3DeU8UnfUcoQZ/rVogXN80=
-github.com/layer5io/academy-theme v0.1.15 h1:cDIOgNOM8qF6o4HVLnQnhyWBpTaaVvUz+ANJzwcTfLA=
 github.com/layer5io/academy-theme v0.1.15/go.mod h1:kAidN16xIX6Dx2TBz7y0u3DeU8UnfUcoQZ/rVogXN80=
-github.com/layer5io/exoscale-academy v0.3.2 h1:zs1qvrpUqLuja7cdXJuD2IZbUev4T6DKbJmpgJqvKh0=
-github.com/layer5io/exoscale-academy v0.3.2/go.mod h1:1S4qs8cy686HvTkvvZt+yhyi3Ey6SRREmPQsl+s7Cxw=
+github.com/layer5io/academy-theme v0.1.19 h1:X2BiWBGRi83lzQkXfz1DNKF5bgrxmj1raZYSxebB84Q=
+github.com/layer5io/academy-theme v0.1.19/go.mod h1:Dv72UWsREOvX4Zg4mJjrpoyDxdgxxpiDotxqYBXMjXo=
+github.com/layer5io/exoscale-academy v0.3.7 h1:pk0d4cahGUJVSPATGltuMksqEe38DaLB9ikrMXy629U=
+github.com/layer5io/exoscale-academy v0.3.7/go.mod h1:5UDX9hXqKw2xBwFt5uY2lV1eMKuIPY0eDsMvPX9Jkt4=
 github.com/layer5io/hugo-academy-theme v0.0.0-20250715053027-36f46b5c4741/go.mod h1:Kp2xgJUAqGztDN/j6T30ApwSaK1Yxs1IvrSgOoRFKnI=
-github.com/layer5io/layer5-academy v0.1.6 h1:imcz2Wsjvv0Dl++P5mGeMF1n9AaIP5qdHtxr7x9Imt4=
-github.com/layer5io/layer5-academy v0.1.6/go.mod h1:43Vsb+x/qWod1ukqqHZYVfrvLxbCCBwusMZpzouVs/U=
-github.com/layer5io/layer5-academy v0.1.7 h1:PB0Q0rfYiJNe44Plcn098ELtKH9hO5V4mOWlWUH/+7I=
-github.com/layer5io/layer5-academy v0.1.7/go.mod h1:mxithFlM+rYS6Dfqu95OyCpLN0NJz8Rmg50x8zRzEuw=
+github.com/layer5io/layer5-academy v0.1.10 h1:DY9aDc4WCXoIKZHUgpWYX1xqzel6gKbuEk7dg9MkyFM=
+github.com/layer5io/layer5-academy v0.1.10/go.mod h1:4TFQzqags5gs+2Ljv3wc05ec/YxBo+38ilrNcWTHPcQ=
 github.com/twbs/bootstrap v5.3.6+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
 github.com/twbs/bootstrap v5.3.7+incompatible h1:ea1W8TOWZFkqSK2M0McpgzLiUQVru3bz8aHb0j/XtuM=
 github.com/twbs/bootstrap v5.3.7+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=

resources/_gen/assets/scss/main.scss_a7b64cfe358ca0f98a9b572608f3a01d.content

@@ -1 +1 @@
-{"Target":"/scss/main.min.60d1725029b5790d890eb5caf20127b56a58a6f40c523d1bdb891fc60526193a.css","MediaType":"text/css","Data":{"Integrity":"sha256-YNFyUCm1eQ2JDrXK8gEntWpYpvQMUj0b24kfxgUmGTo="}}
+{"Target":"/scss/main.min.3654fa7f65fe6598afaa6264f8f39c4d3fdc02cc5e0a119a4549147e9e4bb2c9.css","MediaType":"text/css","Data":{"Integrity":"sha256-NlT6f2X+ZZivqmJk+POcTT/cAsxeChGaRUkUfp5Lssk="}}