ci: stop committing versions to master on merge (--no-bitmap-commit + bitmapAutoSync)

.circleci/config.yml

@@ -794,16 +794,15 @@ jobs:
                 circleci-agent step halt
               fi
             fi
-      - run: cd bit && npm run generate-cli-reference
-      - run: cd bit && npm run generate-cli-reference-json
-      - run: cd bit && npm run generate-cli-reference-docs
-      - run: cd bit && npm run generate-cli-skill
-      - run: cd bit && bit status # just to make sure that the new cli-reference.mdx file is valid
-      - run: cd bit && npm run generate-core-aspects-ids
+      # CLI-reference / core-aspects-ids files are verified and committed in the PR by the
+      # check_generated_reference job, so they are no longer regenerated here. Combined with
+      # --no-bitmap-commit below, bit ci merge no longer pushes any commit to the default
+      # branch: new versions live in the scope and are reconciled into each workspace's
+      # .bitmap via `bitmapAutoSync: true` (workspace.jsonc).
       - run:
           name: 'bit ci merge'
-          command: 'cd bit && bit ci merge --build --auto-merge-resolve manual ${BIT_CI_MERGE_EXTRA_FLAGS}'
-          # command: 'cd bit && bit ci merge --build --auto-merge-resolve manual --increment-by 2 ${BIT_CI_MERGE_EXTRA_FLAGS}'
+          command: 'cd bit && bit ci merge --build --auto-merge-resolve manual --no-bitmap-commit ${BIT_CI_MERGE_EXTRA_FLAGS}'
+          # command: 'cd bit && bit ci merge --build --auto-merge-resolve manual --no-bitmap-commit --increment-by 2 ${BIT_CI_MERGE_EXTRA_FLAGS}'
           no_output_timeout: '50m'
           environment:
             NODE_OPTIONS: --max-old-space-size=30000

workspace.jsonc

@@ -7,7 +7,12 @@
     "defaultDirectory": "components",
     // Setting this to false since the external core aspect env uses the core aspects
     // so we need it to be installed in a capsule
-    "resolveEnvsFromRoots": false
+    "resolveEnvsFromRoots": false,
+    // CI merges with `bit ci merge --no-bitmap-commit`, so .bitmap version pointers are
+    // never committed to the default branch. Every command on the main lane reconciles
+    // .bitmap against the latest exported scope HEAD instead (the scope is the source of
+    // truth for versions); see reconcileBitmapWithScopeIfNeeded in workspace.ts.
+    "bitmapAutoSync": true
   },
   "teambit.dependencies/dependency-resolver": {
     "allowScripts": {