Merge branch 'main' into dependabot/npm_and_yarn/types/node-20.14.12

CheckmarxDev · Jul 28, 2024 · 05c13ec · 05c13ec
2 parents d7cce32 + 66e22e7
commit 05c13ec
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,12 +15,6 @@ jobs:
           sudo apt-get install git-lfs
           git lfs install
 
-      # GIT CONFIGURATION
-      - name: Configure Git user
-        run: |
-          git config --global user.email "[email protected]"
-          git config --global user.name "Your Name"
-
       - name: Use Node.js 14
         uses: actions/[email protected]
         with:

diff --git a/.github/workflows/update-cli.yml b/.github/workflows/update-cli.yml
@@ -37,7 +37,15 @@ jobs:
           # Update current release
           echo ${{ steps.checkmarx-ast-cli.outputs.release_tag }} > checkmarx-ast-cli.version
 
+      - name: Download latest cli and update branch
+        if: steps.checkmarx-ast-cli.outputs.current_tag != steps.checkmarx-ast-cli.outputs.release_tag
+        run: |
+          # Update binaries
+          chmod +x ./.github/scripts/update_cli.sh
+          ./.github/scripts/update_cli.sh ${{ steps.checkmarx-ast-cli.outputs.release_tag }}
+
       - name: Track large files with Git LFS
+        if: steps.checkmarx-ast-cli.outputs.current_tag != steps.checkmarx-ast-cli.outputs.release_tag
         run: |
           git lfs track "src/main/wrapper/resources/cx-linux"
           git lfs track "src/main/wrapper/resources/cx.exe"
@@ -46,13 +54,6 @@ jobs:
           git add src/main/wrapper/resources/cx-linux src/main/wrapper/resources/cx.exe src/main/wrapper/resources/cx-mac
           git commit -m "Track Checkmarx CLI binaries with Git LFS"
 
-      - name: Download latest cli and update branch
-        if: steps.checkmarx-ast-cli.outputs.current_tag != steps.checkmarx-ast-cli.outputs.release_tag
-        run: |
-          # Update binaries
-          chmod +x ./.github/scripts/update_cli.sh
-          ./.github/scripts/update_cli.sh ${{ steps.checkmarx-ast-cli.outputs.release_tag }}
-
       - name: Create Pull Request
         if: steps.checkmarx-ast-cli.outputs.current_tag != steps.checkmarx-ast-cli.outputs.release_tag
         uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c #v6

diff --git a/checkmarx-ast-cli.version b/checkmarx-ast-cli.version
@@ -1 +1 @@
-2.2.0
+2.2.1
diff --git a/src/main/wrapper/resources/cx-linux b/src/main/wrapper/resources/cx-linux
diff --git a/src/main/wrapper/resources/cx-mac b/src/main/wrapper/resources/cx-mac
diff --git a/src/main/wrapper/resources/cx.exe b/src/main/wrapper/resources/cx.exe