merge: resolve conflicts from main

Prioritize main's changes for non-functional differences (variable
renames, indentation). Drop the branch's generate-db-fixtures CI job
since main now ships DB fixtures as committed tarballs extracted via
make fixtures. Keep the db-compat-artifacts Makefile target from the
branch. Also fix the broken GITHUB_PATH handling in the test job.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: kariy