From 3050196713f6f312d3b26db9324de2e7fee47dbe Mon Sep 17 00:00:00 2001 From: Ralf Handl Date: Thu, 16 Oct 2025 13:13:09 +0200 Subject: [PATCH] More precise restore Sync changes in other subfolders of tests Avoid potential confusion with bash globbing --- .github/workflows/sync-dev-to-vX.Y-dev.yaml | 6 +++--- .github/workflows/sync-main-to-dev.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/sync-dev-to-vX.Y-dev.yaml b/.github/workflows/sync-dev-to-vX.Y-dev.yaml index 3019659006..279d4a5a77 100644 --- a/.github/workflows/sync-dev-to-vX.Y-dev.yaml +++ b/.github/workflows/sync-dev-to-vX.Y-dev.yaml @@ -44,9 +44,9 @@ jobs: git checkout -b $SYNC origin/$SYNC || git checkout -b $SYNC origin/$BASE git merge origin/$HEAD -m "Merge $HEAD into $SYNC" - git checkout origin/$BASE src/* - git checkout origin/$BASE tests/* - git commit -m "Restored src/* and tests/*" || echo "" + git checkout origin/$BASE src/ + git checkout origin/$BASE tests/schema/ + git commit -m "Restored src/ and tests/schema/" || echo "" git push -u origin $SYNC EXISTS=$(gh pr list --base $BASE --head $SYNC \ diff --git a/.github/workflows/sync-main-to-dev.yaml b/.github/workflows/sync-main-to-dev.yaml index 09e1cd16e9..5692a7ab59 100644 --- a/.github/workflows/sync-main-to-dev.yaml +++ b/.github/workflows/sync-main-to-dev.yaml @@ -40,9 +40,9 @@ jobs: git checkout -b $SYNC origin/$SYNC || git checkout -b $SYNC origin/$BASE git merge origin/$HEAD -m "Merge $HEAD into $SYNC" - git checkout origin/$BASE src/* - git checkout origin/$BASE tests/* - git commit -m "Restored src/* and tests/*" || echo "" + git checkout origin/$BASE src/ + git checkout origin/$BASE tests/schema/ + git commit -m "Restored src/ and tests/schema/" || echo "" git push -u origin $SYNC EXISTS=$(gh pr list --base $BASE --head $SYNC \