Added documentation and circle cir configuration changes (#1338)

Co-authored-by: Satyam Chaurasia <[email protected]>
checkmarx-ltd · Apr 1, 2024 · 9e0fd01 · 9e0fd01
1 parent 4cc4e7f
commit 9e0fd01
Show file tree

Hide file tree

Showing 4 changed files with 172 additions and 161 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -126,21 +126,21 @@ jobs:
           command: |
             VERSION=$(cat ./build/libs/version.txt)
             SHA1_SHORT=${CIRCLE_SHA1::7}
-            docker login -u ${DCR_USR} -p ${DCR_PW} docker.io
+            docker login -u ${DOCKER_USER} -p ${DOCKER_PASSWORD} docker.io
             docker build --target java17 \
-              -t ${DCR_REPO}:${SHA1_SHORT} \
-              -t ${DCR_REPO}:${VERSION}-17 \
-              -t ${DCR_REPO}:${VERSION} \
-              -t ${DCR_REPO} \
+              -t ${DOCKER_REPO}:${SHA1_SHORT} \
+              -t ${DOCKER_REPO}:${VERSION}-17 \
+              -t ${DOCKER_REPO}:${VERSION} \
+              -t ${DOCKER_REPO} \
               .
-              docker push ${DCR_REPO}:${SHA1_SHORT}
+              docker push ${DOCKER_REPO}:${SHA1_SHORT}
       - run:
           name: Archive Docker images
           command: |
             VERSION=$(cat ./build/libs/version.txt)
-            docker save -o image-17.tar ${DCR_REPO}:${VERSION}-17
-            docker save -o image.tar ${DCR_REPO}:${VERSION}
-            docker save -o latest.tar ${DCR_REPO}:latest
+            docker save -o image-17.tar ${DOCKER_REPO}:${VERSION}-17
+            docker save -o image.tar ${DOCKER_REPO}:${VERSION}
+            docker save -o latest.tar ${DOCKER_REPO}:latest
       - persist_to_workspace:
           root: .
           paths:
@@ -517,8 +517,8 @@ jobs:
       - run:
           name: Publish Docker images to Docker Hub
           command: |
-            docker login -u ${DCR_USR} -p ${DCR_PW} docker.io
-            docker push ${DCR_REPO}
+            docker login -u ${DOCKER_USER} -p ${DOCKER_PASSWORD} docker.io
+            docker push ${DOCKER_REPO}
   publish-github-release:
     docker:
       - image: circleci/golang:1.16.12
@@ -627,9 +627,9 @@ workflows:
       - CxGo-integration-tests:
           requires:
             - deploy-cxflow
-      - CodeBashing-integration-tests:
-          requires:
-            - deploy-cxflow
+     # - CodeBashing-integration-tests:
+      #    requires:
+       #     - deploy-cxflow
       - publish-github-pre-release:
           filters:
             branches:
@@ -642,19 +642,19 @@ workflows:
             - SAST-CLI-integration-tests
             - SCA-CLI-integration-tests
             - CxGo-integration-tests
-            - CodeBashing-integration-tests
+            #- CodeBashing-integration-tests
       - docker-push-stable:
           filters:
             branches:
-              only: develop
+              only: master
           requires:
             - integration-tests
             - sca-integration-tests
             - jira-integration-tests
             - pullRequestComments-integration-tests
             - SAST-CLI-integration-tests
             - CxGo-integration-tests
-            - CodeBashing-integration-tests
+            #- CodeBashing-integration-tests
       - publish-github-release:
           filters:
             branches:
@@ -667,7 +667,7 @@ workflows:
             - SAST-CLI-integration-tests
             - SCA-CLI-integration-tests
             - CxGo-integration-tests
-            - CodeBashing-integration-tests
+           # - CodeBashing-integration-tests
       - cleanup:
           cluster-name: eks-cxflow-ci
           namespace: cxflow-${CIRCLE_SHA1::7}
@@ -688,7 +688,7 @@ workflows:
             - SAST-CLI-integration-tests
             - SCA-CLI-integration-tests
             - CxGo-integration-tests
-            - CodeBashing-integration-tests
+            #- CodeBashing-integration-tests
   nightly-cleanup:
     triggers:
       - schedule:

diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ import org.gradle.api.tasks.testing.Test
 
 buildscript {
     ext {
-        CxSBSDK = "0.6.3"
+        CxSBSDK = "0.6.4"
         ConfigProviderVersion = '1.0.14'
         //cxVersion = "8.90.5"
         springBootVersion = '3.2.4'