diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index e4be09c1..15f2bc1d 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -94,11 +94,6 @@ jobs: fi - name: 'Configure: Install Trivy' uses: ./.github/actions/install-trivy - - name: 'Action: Trivy scan' - shell: bash - run: | - BUILD_DIR=$(realpath $MAIN_PATH) - $BUILD_DIR/scan-folders.sh table - name: 'Upload: Error logs' if: ${{ failure() }} uses: actions/upload-artifact@v3 diff --git a/scripts/determine-modules-changed.sh b/scripts/determine-modules-changed.sh index da9f52a4..8bc696f5 100755 --- a/scripts/determine-modules-changed.sh +++ b/scripts/determine-modules-changed.sh @@ -18,25 +18,9 @@ function addItem() { } MODIFIED="$*" ALL_MODULES=$(find . -name "pom.xml" -not -path './spring-cloud-dataflow-apps-plugin/*' -type f -exec dirname '{}' \; | sed 's/\.\///' | sort -r) -MODULES= -for file in $MODIFIED; do - FILE=$(realpath $file) - echo "$file was changed" - for ITEM in $ALL_MODULES; do - if [[ "$ITEM" != "." ]] && [[ "$file" == *"$ITEM"* ]]; then - echo "Matched $ITEM" - HAS_ITEM=$(itemInModules) - if ((HAS_ITEM == 0)); then - echo "Add:$ITEM" - MODULES=$(addItem "$ITEM") - fi - break - fi - done -done echo "[" >modules.json COUNT=0 -for module in $MODULES; do +for module in $ALL_MODULES; do if ((COUNT > 0)); then echo "," >> modules.json fi