Merge pull request #138 from layer5io/leecalcote/ci/makefile-overhaul

Leecalcote/ci/makefile-overhaul

Author: hortison

.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/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}

Makefile

@@ -1,43 +1,53 @@
 # Copyright Layer5, Inc.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed under the GNU Affero General Public License, Version 3.0
+# (the # "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#    https://www.gnu.org/licenses/agpl-3.0.en.html
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#include .github/build/Makefile.show-help.mk
+include .github/build/Makefile.core.mk
+include .github/build/Makefile.show-help.mk
 
-## Install academy-example dependencies on your local machine.
-## See https://gohugo.io/categories/installation
+#----------------------------------------------------------------------------
+# Academy
+# ---------------------------------------------------------------------------
+## Install site dependencies
 setup:
 	npm install
 
-## Run on your local machine with draft and future content enabled.
+## Build and run site locally with draft and future content enabled.
 site: check-go
 	hugo server -D -F
 
+## Build site for local consumption
 build:
-	hugo
+	hugo build
 
 ## Empty build cache and run on your local machine.
 clean: 
 	hugo --cleanDestinationDir
 	make site
 
+
+
+## ------------------------------------------------------------
+----MAINTENANCE: Show help for available targets
+
 check-go:
 	@echo "Checking if Go is installed..."
 	@command -v go > /dev/null || (echo "Go is not installed. Please install it before proceeding."; exit 1)
 	@echo "Go is installed."
 
-## Update academy-theme package to latest version
-academy-update:
+## Update the academy-theme package to latest version
+theme-update:
+	echo "Updating to latest academy-theme..." && \
 	hugo mod get -u
 
-.PHONY: setup build site clean site-fast check-go academy-update
+.PHONY: setup build site clean site-fast check-go theme-update

go.mod

@@ -1,3 +1,9 @@
 module github.com/layer5io/exoscale-academy
 
 go 1.24.5
+
+require (
+	github.com/FortAwesome/Font-Awesome v0.0.0-20241216213156-af620534bfc3 // indirect
+	github.com/layer5io/academy-theme v0.1.19 // indirect
+	github.com/twbs/bootstrap v5.3.7+incompatible // indirect
+)

go.sum

@@ -0,0 +1,8 @@
+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/layer5io/academy-theme v0.1.19 h1:X2BiWBGRi83lzQkXfz1DNKF5bgrxmj1raZYSxebB84Q=
+github.com/layer5io/academy-theme v0.1.19/go.mod h1:Dv72UWsREOvX4Zg4mJjrpoyDxdgxxpiDotxqYBXMjXo=
+github.com/twbs/bootstrap v5.3.7+incompatible h1:ea1W8TOWZFkqSK2M0McpgzLiUQVru3bz8aHb0j/XtuM=
+github.com/twbs/bootstrap v5.3.7+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=