From 0f4fe9d12e7099d9abf0764414db234675dec62f Mon Sep 17 00:00:00 2001 From: elchananarb Date: Sun, 28 Jul 2024 10:39:38 +0300 Subject: [PATCH 1/2] update-cli.yml (AST-48101) adds a condition to the Git LFS commit step to ensure that commits are only made if there are changes to commit --- .github/workflows/update-cli.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/update-cli.yml b/.github/workflows/update-cli.yml index 7ba2792f..c9d34860 100644 --- 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 From 3081909236bfa1470b3b14231e9af287338a8f05 Mon Sep 17 00:00:00 2001 From: elchananarb Date: Sun, 28 Jul 2024 10:43:02 +0300 Subject: [PATCH 2/2] Update ci.yml --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fcde3636..c691a39c 100644 --- 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 "you@example.com" - git config --global user.name "Your Name" - - name: Use Node.js 14 uses: actions/setup-node@v4.0.2 with: