diff --git a/.github/workflows/indexer-sync.yml b/.github/workflows/indexer-sync.yml index e06b31ff9..da7ec49bf 100644 --- a/.github/workflows/indexer-sync.yml +++ b/.github/workflows/indexer-sync.yml @@ -12,6 +12,11 @@ on: required: false default: false type: boolean + debug_mode: + description: 'Enable debug logging' + required: false + default: false + type: boolean concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -52,7 +57,11 @@ jobs: - name: Run indexer sync run: | # Run the sync script with -z mode, automation mode, and push enabled - ./scripts/indexer-sync-v2.sh -z -a -p -b automated-indexer-sync -o origin + if [ "${{ github.event.inputs.debug_mode }}" = "true" ]; then + ./scripts/indexer-sync-v2.sh -z -a -p -b automated-indexer-sync -o origin -m debug + else + ./scripts/indexer-sync-v2.sh -z -a -p -b automated-indexer-sync -o origin + fi - name: Create or update pull request run: | diff --git a/scripts/indexer-sync-v2.sh b/scripts/indexer-sync-v2.sh index 003eead9f..3552fb3b1 100755 --- a/scripts/indexer-sync-v2.sh +++ b/scripts/indexer-sync-v2.sh @@ -568,7 +568,7 @@ resolve_conflicts() { } handle_yml_conflicts() { - yml_remove=$(git status --porcelain | grep yml | grep -vi "definitions/" | awk -F '[ADUMRC]{1,2} ' '{print $2}' | awk '{ gsub(/^[ \t]+|[ \t]+$/, ""); print }') + yml_remove=$(git status --porcelain | grep yml | grep -vi "definitions/" | grep -v "definitions-update" | awk -F '[ADUMRC]{1,2} ' '{print $2}' | awk '{ gsub(/^[ \t]+|[ \t]+$/, ""); print }') for def in $yml_remove; do log "DEBUG" "Removing non-definition yml; [$yml_remove]" if git ls-files | grep -q "^$yml_remove$"; then