Fix make recipes order

antmicro · Jun 26, 2023 · dffb81f · dffb81f
1 parent 5b2d9d1
commit dffb81f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/.github/scripts/indexgen/Makefile b/.github/scripts/indexgen/Makefile
@@ -2,9 +2,11 @@ SPHINXOPTS   ?=
 SPHINXBUILD  ?= sphinx-build
 SOURCEDIR     = source.template
 GENDIR        = source
-BUILDDIR      = build
+BUILDDIR     ?= build
 ROOTDIR      ?= work
 
+all: clean html
+
 # Sources
 SOURCES = $(wildcard $(SOURCEDIR)/*.md)
 
@@ -22,11 +24,8 @@ html: Makefile $(GENDIR)/index.md
 	@rsync -avr "$(ROOTDIR)/" "$(BUILDDIR)/html"
 	@bash update_styles.sh "$(BUILDDIR)"
 
-all: html
-
 clean:
 	@rm -rf $(BUILDDIR)
 	@rm -rf $(GENDIR)
 
 .PHONY: all clean html
-
diff --git a/.github/scripts/indexgen/update_styles.sh b/.github/scripts/indexgen/update_styles.sh
@@ -40,7 +40,7 @@ update_styles(){
         echo -e "${COLOR_WHITE}========== $ASSET =========${COLOR_CLEAR}"
         copy_files $ASSET $(basename "$ASSET")
     done
-    echo -e "${COLOR_GREEN}UPDATE_STYLES.SH SUCCEEDED${COLOR_CLEAR}"
+    echo -e "${COLOR_WHITE}Update styles ${COLOR_GREEN}SUCCEEDED${COLOR_CLEAR}"
     echo -e "${COLOR_WHITE}==========================${COLOR_CLEAR}"
 }
 

diff --git a/.github/scripts/update_webpage.sh b/.github/scripts/update_webpage.sh
@@ -40,7 +40,7 @@ update_webpage(){
     LOC_GITHUB_EVENT_NAME=$2
     PR_NUMBER=$3
     echo -e "${COLOR_WHITE}========== update_webpage args =========${COLOR_CLEAR}"
-    echo -e "${COLOR_WHITE}LOC_GITHUB_REF_NAME        = ${LOC_GITHUB_REF_NAME}"
+    echo -e "${COLOR_WHITE}LOC_GITHUB_REF_NAME   = ${LOC_GITHUB_REF_NAME}"
     echo -e "${COLOR_WHITE}LOC_GITHUB_EVENT_NAME = ${LOC_GITHUB_EVENT_NAME}"
     echo -e "${COLOR_WHITE}PR_NUMBER             = ${PR_NUMBER}"
 
@@ -65,10 +65,10 @@ update_webpage(){
     replace_dir ./coverage_dashboard ${PUBLIC_DIR}/${DIR}/coverage_dashboard
     replace_dir ./verification_dashboard ${PUBLIC_DIR}/${DIR}/verification_dashboard
 
-    make -C .github/scripts/indexgen ROOTDIR=`realpath ./public.old` BUILDDIR=`realpath ./public.new`
-
+    make -C .github/scripts/indexgen all ROOTDIR=`realpath ./public.old` BUILDDIR=`realpath ./public.new`
+    echo -e "${COLOR_WHITE}Makefile exit status:$?${COLOR_CLEAR}"
     echo -e "${COLOR_WHITE}================= tree =================${COLOR_CLEAR}"
-    tree ./public.new/
+    tree -d -L 3 ./public.new/
 
     echo -e "${COLOR_WHITE}Webpage update ${COLOR_GREEN}SUCCEEDED${COLOR_CLEAR}"
     echo -e "${COLOR_WHITE}============ update_webpage ============${COLOR_CLEAR}"