From 6e76d0ca86dd4a771f502201ce759aabe5437ff8 Mon Sep 17 00:00:00 2001
From: Jason Wen <haibin.wen3@gmail.com>
Date: Thu, 31 Jul 2025 14:10:45 -0400
Subject: [PATCH] ci: more ref change to `master`

---
 .github/workflows/auto_pr_review.yaml | 2 +-
 README.md                             | 2 +-
 opendbc_repo                          | 2 +-
 release/ci/squash_and_merge_prs.py    | 2 +-
 system/version.py                     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/auto_pr_review.yaml b/.github/workflows/auto_pr_review.yaml
index a5318c12da..ec78f276a5 100644
--- a/.github/workflows/auto_pr_review.yaml
+++ b/.github/workflows/auto_pr_review.yaml
@@ -29,7 +29,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        target: /^(?!master-new$).*/
+        target: /^(?!master$).*/
         exclude: /sunnypilot:.*/
         change-to: ${{ github.base_ref }}
         already-exists-action: close_this
diff --git a/README.md b/README.md
index 28a504e9dc..805c4b73d8 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ Please refer to [Recommended Branches](#-recommended-branches) to find your pref
 ## 🎆 Pull Requests
 We welcome both pull requests and issues on GitHub. Bug fixes are encouraged.
 
-Pull requests should be against the most current `master-new` branch.
+Pull requests should be against the most current `master` branch.
 
 ## 📊 User Data
 
diff --git a/opendbc_repo b/opendbc_repo
index f4a96734a5..2a11f9627c 160000
--- a/opendbc_repo
+++ b/opendbc_repo
@@ -1 +1 @@
-Subproject commit f4a96734a510db2d8131f93352842d29129ea000
+Subproject commit 2a11f9627cf7e43c0d7b0ab25051b7b305f03c1f
diff --git a/release/ci/squash_and_merge_prs.py b/release/ci/squash_and_merge_prs.py
index b26b08d500..0f20f4f900 100755
--- a/release/ci/squash_and_merge_prs.py
+++ b/release/ci/squash_and_merge_prs.py
@@ -12,7 +12,7 @@ TRUST_FORK_LABEL = "trust-fork-pr"
 def setup_argument_parser():
   parser = argparse.ArgumentParser(description='Process and squash GitHub PRs')
   parser.add_argument('--pr-data', type=str, help='PR data in JSON format')
-  parser.add_argument('--source-branch', type=str, default='master-new',
+  parser.add_argument('--source-branch', type=str, default='master',
                       help='Source branch for merging')
   parser.add_argument('--target-branch', type=str, default='master-dev-c3-new-test',
                       help='Target branch for merging')
diff --git a/system/version.py b/system/version.py
index 73200473fe..34c9ade24d 100755
--- a/system/version.py
+++ b/system/version.py
@@ -12,7 +12,7 @@ from openpilot.common.git import get_commit, get_origin, get_branch, get_short_b
 
 RELEASE_SP_BRANCHES = ['release-c3']
 TESTED_SP_BRANCHES = ['staging-c3', 'staging-c3-new']
-MASTER_SP_BRANCHES = ['master', 'master-new']
+MASTER_SP_BRANCHES = ['master']
 RELEASE_BRANCHES = ['release3-staging', 'release3', 'nightly'] + RELEASE_SP_BRANCHES
 TESTED_BRANCHES = RELEASE_BRANCHES + ['devel', 'devel-staging', 'nightly-dev'] + TESTED_SP_BRANCHES