Fix main CI history checkout and release-only backmerge

Author: alexphillips-dev

.github/workflows/ci.yml

@@ -15,6 +15,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup Node
         uses: actions/setup-node@v4

scripts/sync_main_to_dev.sh

@@ -10,6 +10,32 @@ DEV_REF="origin/dev"
 
 git fetch origin main dev --tags
 
+release_only_path() {
+  local path="${1:-}"
+  case "${path}" in
+    folderview.plus.plg|archive/folderview.plus-*.txz|archive/folderview.plus-*.txz.sha256)
+      return 0
+      ;;
+    *)
+      return 1
+      ;;
+  esac
+}
+
+main_differs_from_dev_only_by_release_artifacts() {
+  local path=""
+  mapfile -t DIFF_PATHS < <(git diff --name-only "${DEV_REF}..${MAIN_REF}" || true)
+  if [ "${#DIFF_PATHS[@]}" -eq 0 ]; then
+    return 1
+  fi
+  for path in "${DIFF_PATHS[@]}"; do
+    if ! release_only_path "${path}"; then
+      return 1
+    fi
+  done
+  return 0
+}
+
 if git show-ref --verify --quiet "refs/heads/${DEV_BRANCH}"; then
   git checkout "${DEV_BRANCH}"
 else
@@ -21,6 +47,11 @@ if git merge-base --is-ancestor "${MAIN_REF}" "${DEV_BRANCH}"; then
   exit 0
 fi
 
+if main_differs_from_dev_only_by_release_artifacts; then
+  echo "Main differs from dev only by release artifacts/manifest. Skipping back-merge."
+  exit 0
+fi
+
 MERGED_CLEANLY=1
 if ! git merge --no-ff --no-commit "${MAIN_REF}"; then
   MERGED_CLEANLY=0
@@ -35,21 +66,15 @@ if [ "${MERGED_CLEANLY}" -eq 0 ]; then
   fi
 
   for FILE in "${CONFLICTS[@]}"; do
-    case "${FILE}" in
-      folderview.plus.plg|archive/folderview.plus-*.txz|archive/folderview.plus-*.txz.sha256)
-        ;;
-      *)
-        echo "Unexpected merge conflict in ${FILE}; aborting auto back-merge." >&2
-        git merge --abort
-        exit 1
-        ;;
-    esac
+    if ! release_only_path "${FILE}"; then
+      echo "Unexpected merge conflict in ${FILE}; aborting auto back-merge." >&2
+      git merge --abort
+      exit 1
+    fi
   done
 
-  for FILE in "${CONFLICTS[@]}"; do
-    git checkout --ours -- "${FILE}"
-    git add "${FILE}"
-  done
+  git checkout HEAD -- archive folderview.plus.plg
+  git add archive folderview.plus.plg
 fi
 
 # Always force dev channel URLs in case main touched these lines without conflicts.
@@ -67,4 +92,3 @@ if git rev-parse -q --verify MERGE_HEAD >/dev/null; then
 else
   echo "No merge head present; nothing to commit."
 fi
-