ci: updated to latest kash

kalisio · May 16, 2024 · 4dc84ce · 4dc84ce
1 parent 344e6fd
commit 4dc84ce
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 21 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -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:
@@ -43,7 +43,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 +63,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 service
         env:

diff --git a/scripts/build_service.sh b/scripts/build_service.sh
@@ -5,21 +5,23 @@ set -euo pipefail
 THIS_FILE=$(readlink -f "${BASH_SOURCE[0]}")
 THIS_DIR=$(dirname "$THIS_FILE")
 ROOT_DIR=$(dirname "$THIS_DIR")
+WORKSPACE_DIR="$(dirname "$ROOT_DIR")"
 
 . "$THIS_DIR/kash/kash.sh"
 
 ## Parse options
 ##
 
 PUBLISH=false
-CI_STEP_NAME="Build app"
+CI_STEP_NAME="Build service"
 while getopts "pr:" option; do
     case $option in
         p) # publish app
             PUBLISH=true
             ;;
         r) # report outcome to slack
             CI_STEP_NAME=$OPTARG
+            load_env_files "$WORKSPACE_DIR/development/common/SLACK_WEBHOOK_SERVICES.enc.env"
             trap 'slack_ci_report "$ROOT_DIR" "$CI_STEP_NAME" "$?" "$SLACK_WEBHOOK_SERVICES"' EXIT
             ;;
         *)
@@ -30,31 +32,33 @@ done
 ## Init workspace
 ##
 
-WORKSPACE_DIR="$(dirname "$ROOT_DIR")"
 init_lib_infos "$ROOT_DIR"
 
-LIB=$(get_lib_name)
+NAME=$(get_lib_name)
 VERSION=$(get_lib_version)
 GIT_TAG=$(get_lib_tag)
 
-echo "About to build ${LIB} v${VERSION}..."
+# Strip @kalisio part
+NAME=${NAME#*/}
 
-load_env_files "$WORKSPACE_DIR/development/common/kalisio_dockerhub.enc.env" "$WORKSPACE_DIR/development/common/SLACK_WEBHOOK_SERVICES.enc.env"
+echo "About to build $NAME v$VERSION ..."
+
+load_env_files "$WORKSPACE_DIR/development/common/kalisio_dockerhub.enc.env"
 load_value_files "$WORKSPACE_DIR/development/common/KALISIO_DOCKERHUB_PASSWORD.enc.value"
 
 ## Build container
 ##
 
-IMAGE_NAME="kalisio/k2"
-if [[ -z "$GIT_TAG" ]]; then
-    IMAGE_TAG=latest
-else
+IMAGE_NAME="$KALISIO_DOCKERHUB_URL/kalisio/$NAME"
+IMAGE_TAG=latest
+
+if [[ -n "$GIT_TAG" ]]; then
     IMAGE_TAG=$VERSION
 fi
 
-begin_group "Building container ..."
+begin_group "Building container $IMAGE_NAME:$IMAGE_TAG ..."
 
-docker login --username "$KALISIO_DOCKERHUB_USERNAME" --password-stdin < "$KALISIO_DOCKERHUB_PASSWORD"
+docker login --username "$KALISIO_DOCKERHUB_USERNAME" --password-stdin "$KALISIO_DOCKERHUB_URL" < "$KALISIO_DOCKERHUB_PASSWORD"
 # DOCKER_BUILDKIT is here to be able to use Dockerfile specific dockerginore (app.Dockerfile.dockerignore)
 DOCKER_BUILDKIT=1 docker build \
     -f Dockerfile \
@@ -67,4 +71,4 @@ fi
 
 docker logout
 
-end_group "Building container ..."
+end_group "Building container $IMAGE_NAME:$IMAGE_TAG ..."
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
@@ -39,6 +36,6 @@ else
     git_shallow_clone "$GITHUB_URL/kalisio/k2.git" "$WORKSPACE_DIR/k2" "${WORKSPACE_TAG:-${WORKSPACE_BRANCH:-}}"
 fi
 
-setup_lib_workspace "$WORKSPACE_DIR" "$DEVELOPMENT_REPO_URL"
+setup_workspace "$WORKSPACE_DIR" "$DEVELOPMENT_REPO_URL"
 
 end_group "Setting up workspace ..."