ci: updated to latest kash

kalisio · May 23, 2024 · 4bfb918 · 4bfb918
1 parent e7bce07
commit 4bfb918
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 18 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -1,4 +1,4 @@
-name: CI
+name: ci
 on: [ push, workflow_dispatch ]
 
 jobs:
@@ -15,7 +15,7 @@ jobs:
         run: bash ./scripts/init_runner.sh ${{ github.job }}
       - name: Setup workspace
         env:
-          GITHUB_DEVELOPMENT_PAT: ${{ secrets.GH_DEVELOPMENT_PAT }}
+          GITHUB_DEVELOPMENT_TOKEN: ${{ secrets.GH_DEVELOPMENT_TOKEN }}
         run: bash ./scripts/setup_workspace.sh
       - name: Run tests
         env:
@@ -26,11 +26,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [ 16, 18, 20 ]
-        mongo: [ 4, 5, 6 ]
-        exclude:
-          - node: 16
-            mongo: 4
+        node: [ 18, 20 ]
+        mongo: [ 5, 6, 7 ]
     name: Additional tests (node ${{ matrix.node }}, mongo ${{ matrix.mongo }})
     if: ${{ contains(github.event.head_commit.message, 'additional tests') }}
     runs-on: ubuntu-22.04
@@ -43,7 +40,7 @@ jobs:
         run: bash ./scripts/init_runner.sh ${{ github.job }}
       - name: Setup workspace
         env:
-          GITHUB_DEVELOPMENT_PAT: ${{ secrets.GH_DEVELOPMENT_PAT }}
+          GITHUB_DEVELOPMENT_TOKEN: ${{ secrets.GH_DEVELOPMENT_TOKEN }}
         run: bash ./scripts/setup_workspace.sh -n ${{ matrix.node }}
       - name: Run tests
         env:
@@ -63,7 +60,7 @@ jobs:
         run: bash ./scripts/init_runner.sh ${{ github.job }}
       - name: Setup workspace
         env:
-          GITHUB_DEVELOPMENT_PAT: ${{ secrets.GH_DEVELOPMENT_PAT }}
+          GITHUB_DEVELOPMENT_TOKEN: ${{ secrets.GH_DEVELOPMENT_TOKEN }}
         run: bash ./scripts/setup_workspace.sh
       - name: Build app
         env:
@@ -72,7 +69,7 @@ jobs:
 
   build_docs:
     name: Build docs
-    if: ${{ contains(github.event.head_commit.message, 'build doc') }}
+    if: ${{ startsWith(github.event.head_commit.message, 'docs:') || contains(github.event.head_commit.message, 'build doc') }}
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repo
@@ -83,7 +80,7 @@ jobs:
         run: bash ./scripts/init_runner.sh ${{ github.job }}
       - name: Setup workspace
         env:
-          GITHUB_DEVELOPMENT_PAT: ${{ secrets.GH_DEVELOPMENT_PAT }}
+          GITHUB_DEVELOPMENT_TOKEN: ${{ secrets.GH_DEVELOPMENT_TOKEN }}
         run: bash ./scripts/setup_workspace.sh
       - name: Build docs
         env:

diff --git a/scripts/init_runner.sh b/scripts/init_runner.sh
@@ -6,7 +6,6 @@ JOB_ID=$1
 
 THIS_FILE=$(readlink -f "${BASH_SOURCE[0]}")
 THIS_DIR=$(dirname "$THIS_FILE")
-# ROOT_DIR=$(dirname "$THIS_DIR")
 
 . "$THIS_DIR/kash/kash.sh"
 
@@ -17,7 +16,7 @@ init_github_run_tests() {
 }
 
 init_github_build_app() {
-    install_reqs age sops nvm node16
+    install_reqs age sops
 }
 
 init_github_build_docs() {

diff --git a/scripts/kash b/scripts/kash
diff --git a/scripts/setup_workspace.sh b/scripts/setup_workspace.sh
@@ -11,14 +11,11 @@ ROOT_DIR=$(dirname "$THIS_DIR")
 ## Parse options
 ##
 
-WORKSPACE_BRANCH=
-WORKSPACE_TAG=
-
 begin_group "Setting up workspace ..."
 
 if [ "$CI" = true ]; then
     WORKSPACE_DIR="$(dirname "$ROOT_DIR")"
-    DEVELOPMENT_REPO_URL="https://$GITHUB_DEVELOPMENT_PAT@github.com/kalisio/development.git"
+    DEVELOPMENT_REPO_URL="https://$GITHUB_DEVELOPMENT_TOKEN@github.com/kalisio/development.git"
 else
     while getopts "b:t" option; do
         case $option in
+19 −0		.github/workflows/run_tests.yaml
+234 −40		kash.sh
+52 −1		scripts/run_tests.sh