wip: more ci

kalisio · Feb 20, 2024 · 2330cbb · 2330cbb
1 parent 2e9e9c1
commit 2330cbb
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 24 deletions.
diff --git a/scripts/build_app.sh b/scripts/build_app.sh
@@ -21,8 +21,8 @@ while getopts "p" option; do
     esac
 done
 
-### Init workspace
-###
+## Init workspace
+##
 
 WORKSPACE_DIR="$(dirname "$ROOT_DIR")"
 init_app_infos "$ROOT_DIR" "$WORKSPACE_DIR/development/workspaces/apps"
@@ -33,9 +33,6 @@ FLAVOR=$(get_app_flavor)
 
 echo "About to build ${APP} v${VERSION}-$FLAVOR ..."
 
-## Load project env
-##
-
 . "$WORKSPACE_DIR/development/workspaces/apps/apps.sh" kapp
 
 ## Build container

diff --git a/scripts/build_docs.sh b/scripts/build_docs.sh
@@ -3,27 +3,45 @@ set -euo pipefail
 # set -x
 
 THIS_FILE=$(readlink -f "${BASH_SOURCE[0]}")
-THIS_PATH=$(dirname "$THIS_FILE")
-ROOT_PATH=$(dirname "$THIS_PATH")
+THIS_DIR=$(dirname "$THIS_FILE")
+ROOT_DIR=$(dirname "$THIS_DIR")
 
-. "$THIS_PATH/kash/kash.sh"
+. "$THIS_DIR/kash/kash.sh"
+
+## Parse options
+##
 
 PUBLISH=false
-while getopts "p" option; do
-    case $option in
+while getopts "p" OPT; do
+    case $OPT in
         p) # defines mongo version
             PUBLISH=true;;
         *)
             ;;
     esac
 done
 
+## Init workspace
+##
+
+WORKSPACE_DIR="$(dirname "$ROOT_DIR")"
+
+## Build docs
+##
+
 # Build process requires node 18
 use_node 18
 
-rm .postcssrc.js && cd docs && yarn install && yarn build
+rm -f .postcssrc.js && cd docs && yarn install && yarn build
 
 if [ "$PUBLISH" = true ]; then
-    # deploy_gh_pages
-    echo "publish !"
+    load_env_files "$WORKSPACE_DIR/development/common/KAPP_PUSH_DOC_TOKEN.enc.env"
+
+    GIT_COMMIT_SHA=$(get_git_commit_sha "$ROOT_DIR")
+    GIT_AUTHOR=$(get_git_commit_author "$ROOT_DIR")
+    deploy_gh_pages \
+        "https://oauth2:$KAPP_PUSH_DOC_TOKEN@github.com/kalisio/kApp.git" \
+        "$ROOT_DIR/docs/.vitepress/dist" \
+        "$GIT_AUTHOR" \
+        "Docs built from $GIT_COMMIT_SHA"
 fi
diff --git a/scripts/init_runner.sh b/scripts/init_runner.sh
@@ -5,10 +5,10 @@ set -euo pipefail
 JOB_ID=$1
 
 THIS_FILE=$(readlink -f "${BASH_SOURCE[0]}")
-THIS_PATH=$(dirname "$THIS_FILE")
-ROOT_PATH=$(dirname "$THIS_PATH")
+THIS_DIR=$(dirname "$THIS_FILE")
+# ROOT_DIR=$(dirname "$THIS_DIR")
 
-. "$THIS_PATH/kash/kash.sh"
+. "$THIS_DIR/kash/kash.sh"
 
 ### Github Actions
 

diff --git a/scripts/kash b/scripts/kash
diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
@@ -24,8 +24,8 @@ while getopts "m:n:" option; do
     esac
 done
 
-### Init workspace
-###
+## Init workspace
+##
 
 WORKSPACE_DIR="$(dirname "$ROOT_DIR")"
 init_app_infos "$ROOT_DIR" "$WORKSPACE_DIR/development/workspaces/apps"
@@ -36,6 +36,8 @@ FLAVOR=$(get_app_flavor)
 
 echo "About to run tests for ${APP} v${VERSION}-($FLAVOR) ..."
 
+. "$WORKSPACE_DIR/development/workspaces/apps/apps.sh" kapp
+
 ## Start mongo
 ##
 
@@ -46,11 +48,6 @@ k-mongo
 
 end_group "Starting mongo $MONGO_VER ..."
 
-## Load project env
-##
-
-. "$WORKSPACE_DIR/development/workspaces/apps/apps.sh" kapp
-
 ## Run tests
 ##
 

diff --git a/scripts/setup_workspace.sh b/scripts/setup_workspace.sh
@@ -8,6 +8,9 @@ ROOT_DIR=$(dirname "$THIS_DIR")
 
 . "$THIS_DIR/kash/kash.sh"
 
+## Parse options
+##
+
 WORKSPACE_BRANCH=
 WORKSPACE_TAG=
 WORKSPACE_NODE=16