Linear main: WIP

Change-Id: I0cbbc8c47e2d97c8a312f924149bca40748e1de1

Author: SortaCookie

.github/workflows/linearize_main.yaml

@@ -19,7 +19,7 @@ jobs:
         with:
           ref: main
           fetch-tags: true
-          fetch-depth: 0
+          fetch-depth: 10
       - name: Checkout rebase_tools
         uses: actions/checkout@v4
         with:
@@ -40,7 +40,7 @@ jobs:
         run: |
           set -eux
           python main.py linearize --repo-path=${GITHUB_WORKSPACE} --source-branch=main --new-branch-name=automated/linear_main \
-            --start-commit-ref="$(git rev-parse --verify post-chrobalt-tag)" --end-commit-ref="$(git rev-parse --verify origin/main)"
+            --start-commit-ref=8ec342e9694b90e7915e49cd6f5de3235952aea3 --end-commit-ref="$(git rev-parse --verify origin/main)"
       - name: Update automated/linear_main and commit map, extract m114 commits
         run: |
           set -eux
@@ -53,11 +53,10 @@ jobs:
 
           # Create new commits json for m114
           python main.py commits --repo-path=${GITHUB_WORKSPACE} --source-branch=origin/automated/linear_main \
-            --start-commit-ref="$(git rev-parse --verify post-chrobalt-tag)" --end-commit-ref="$(git rev-parse --verify origin/automated/linear_main)" \
+            --start-commit-ref=8ec342e9694b90e7915e49cd6f5de3235952aea3 --end-commit-ref="$(git rev-parse --verify origin/automated/linear_main)" \
             --output-file=${GITHUB_WORKSPACE}/automated_commits_m114.json
           git add automated_commits_m114.json
           git commit -m "Linearization refresh on $(date +'%Y-%m-%d')."
-          export CP_COMMIT="$(git rev-parse --verify HEAD)"
-          git checkout experimental/rebase_tools
-          git cherry-pick --strategy=recursive -X theirs $CP_COMMIT
-          git push --force origin experimental/rebase_tools:experimental/rebase_tools
+          export AUTOMATEED_COMMIT="$(git rev-parse --verify HEAD)"
+          git branch temporary $AUTOMATEED_COMMIT
+          git push --force origin temporary:experimental/rebase_tools