Merge branch 'dev'

Author: vernesong

.github/workflows/trim_core_package_history.yml

@@ -92,14 +92,8 @@ jobs:
           LAST_COMMIT=""
           for c in $(printf "%s\n" "${keep_commits[@]}" | tac); do
             echo "Processing commit $c ..."
-            git checkout "$ORIG_HEAD" -- . || true
-            if git ls-tree -r --name-only "$c" | grep -q '^dev$' 2>/dev/null; then
-              git checkout "$c" -- dev || true
-            fi
-            if git ls-tree -r --name-only "$c" | grep -q '^master$' 2>/dev/null; then
-              git checkout "$c" -- master || true
-            fi
-
+            git checkout -- . || true
+            git checkout "$c" -- . || true
             git add -A || true
             TREE_ID=$(git write-tree)
             AUTHOR_NAME=$(git show -s --format='%an' $c)