Merge branch 'master' of https://github.com/sunnypilot/sunnypilot into master-new

.github/workflows/auto_pr_review.yaml

@@ -29,11 +29,11 @@ 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
-        already-exists-comment: "Your PR should be made against the `master-new` branch"
+        already-exists-comment: "Your PR should be made against the `master` branch"
 
   update-pr-labels:
     name: Update fork's PR Labels

.github/workflows/cereal_validation.yaml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - master-new
   pull_request:
     paths:
       - 'cereal/**'
@@ -17,7 +16,7 @@ on:
         type: string
 
 concurrency:
-  group: cereal-validation-ci-run-${{ inputs.run_number }}-${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/master-new') && github.run_id || github.head_ref || github.ref }}-${{ github.workflow }}-${{ github.event_name }}
+  group: cereal-validation-ci-run-${{ inputs.run_number }}-${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && github.run_id || github.head_ref || github.ref }}-${{ github.workflow }}-${{ github.event_name }}
   cancel-in-progress: true
 
 env:

.github/workflows/compile-openpilot/action.yaml

@@ -15,7 +15,7 @@ runs:
                           scons -j$(nproc) --cache-populate"
     - name: Save scons cache
       uses: actions/cache/save@v4
-      if: (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/master-new')
+      if: github.ref == 'refs/heads/master'
       with:
         path: .ci_cache/scons_cache
         key: scons-${{ runner.arch }}-${{ env.CACHE_COMMIT_DATE }}-${{ github.sha }}

.github/workflows/lfs-maintenance.yaml

@@ -9,10 +9,10 @@ on:
     - cron: '0 0 * * *'  # Runs at 00:00 UTC every day
   push:
     branches:
-      - 'master-new'
+      - 'master'
   pull_request:
     branches:
-      - 'master-new'
+      - 'master'
   workflow_dispatch:  # enables manual triggering
     inputs:
       upstream_branch:

.github/workflows/release-drafter.yml

@@ -3,7 +3,6 @@ name: Release Drafter
 on:
   push:
     branches:
-      - master-new
       - master
     tags:
       - 'v*'

.github/workflows/repo-maintenance.yaml

@@ -28,7 +28,7 @@ jobs:
           title: "[bot] Update translations"
           body: "Automatic PR from repo-maintenance -> update_translations"
           branch: "update-translations"
-          base: "master-new"
+          base: "master"
           delete-branch: true
           labels: bot
 
@@ -66,7 +66,7 @@ jobs:
         commit-message: Update Python packages
         title: '[bot] Update Python packages'
         branch: auto-package-updates
-        base: master-new
+        base: master
         delete-branch: true
         body: 'Automatic PR from repo-maintenance -> package_updates'
         labels: bot

.github/workflows/selfdrive_tests.yaml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - master-new
   pull_request:
   workflow_dispatch:
   workflow_call:
@@ -15,11 +14,11 @@ on:
         type: string
 
 concurrency:
-  group: selfdrive-tests-ci-run-${{ inputs.run_number }}-${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/master-new') && github.run_id || github.head_ref || github.ref }}-${{ github.workflow }}-${{ github.event_name }}
+  group: selfdrive-tests-ci-run-${{ inputs.run_number }}-${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && github.run_id || github.head_ref || github.ref }}-${{ github.workflow }}-${{ github.event_name }}
   cancel-in-progress: true
 
 env:
-  REPORT_NAME: report-${{ inputs.run_number || '1' }}-${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/master-new') && 'master' || github.event.number }}
+  REPORT_NAME: report-${{ inputs.run_number || '1' }}-${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && 'master' || github.event.number }}
   PYTHONWARNINGS: error
   BASE_IMAGE: openpilot-base
   AZURE_TOKEN: ${{ secrets.AZURE_COMMADATACI_OPENPILOTCI_TOKEN }}
@@ -107,7 +106,7 @@ jobs:
         PYTHONWARNINGS: default
     - name: Save Homebrew cache
       uses: actions/cache/save@v4
-      if: (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/master-new')
+      if: github.ref == 'refs/heads/master'
       with:
         path: ~/Library/Caches/Homebrew
         key: brew-macos-${{ env.CACHE_COMMIT_DATE }}-${{ github.sha }}
@@ -124,7 +123,7 @@ jobs:
       run: . .venv/bin/activate && scons -j$(nproc)
     - name: Save scons cache
       uses: actions/cache/save@v4
-      if: (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/master-new')
+      if: github.ref == 'refs/heads/master'
       with:
         path: /tmp/scons_cache
         key: scons-${{ runner.arch }}-macos-${{ env.CACHE_COMMIT_DATE }}-${{ github.sha }}

.github/workflows/sunnypilot-build-prebuilt.yaml

@@ -8,7 +8,7 @@ env:
   PUBLIC_REPO_URL: "https://github.com/sunnypilot/sunnypilot"
   
   # Branch configurations
-  STAGING_C3_SOURCE_BRANCH: ${{ vars.STAGING_C3_SOURCE_BRANCH || 'master-new' }} # vars are set on repo settings.
+  STAGING_C3_SOURCE_BRANCH: ${{ vars.STAGING_C3_SOURCE_BRANCH || 'master' }} # vars are set on repo settings.
   DEV_C3_SOURCE_BRANCH: ${{ vars.DEV_C3_SOURCE_BRANCH || 'master-dev-c3-new' }} # vars are set on repo settings.
   
   # Target branch configurations
@@ -21,7 +21,7 @@ env:
 
 on:
   push:
-    branches: [ master, master-new, master-dev-c3-new ]
+    branches: [ master, master-dev-c3-new ]
     tags: [ '*' ]
   pull_request_target:
     types: [ labeled ]

.github/workflows/sunnypilot-master-dev-c3-prep.yaml

@@ -1,7 +1,7 @@
 name: Build dev-c3-new
 
 env:
-  DEFAULT_SOURCE_BRANCH: "master-new"
+  DEFAULT_SOURCE_BRANCH: "master"
   DEFAULT_TARGET_BRANCH: "master-dev-c3-new"
   PR_LABEL: "dev-c3"
   LFS_URL: 'https://gitlab.com/sunnypilot/public/sunnypilot-new-lfs.git/info/lfs'
@@ -11,18 +11,16 @@ on:
   push:
     branches:
       - master
-      - master-new    
   pull_request_target:
     types: [ labeled ]  
     branches:    
-      - 'master'        
-      - 'master-new'            
+      - 'master'
   workflow_dispatch:
     inputs:
       source_branch:
         description: 'Source branch to reset from'
         required: true
-        default: 'master-new'
+        default: 'master'
         type: string
       target_branch:
         description: 'Target branch to reset and squash into'

.github/workflows/ui_preview.yaml

@@ -3,20 +3,18 @@ on:
   push:
     branches:
       - master
-      - master-new
   pull_request_target:
     types: [assigned, opened, synchronize, reopened, edited]
     branches:
       - 'master'
-      - 'master-new'
     paths:
       - 'selfdrive/ui/**'
   workflow_dispatch:
 
 env:
   UI_JOB_NAME: "Create UI Report"
-  REPORT_NAME: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/master-new') && 'master' || github.event.number }}
-  SHA: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/master-new') && github.sha || github.event.pull_request.head.sha }}
+  REPORT_NAME: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && 'master' || github.event.number }}
+  SHA: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && github.sha || github.event.pull_request.head.sha }}
   BRANCH_NAME: "openpilot/pr-${{ github.event.number }}"
 
 jobs:
@@ -66,7 +64,7 @@ jobs:
           ref: openpilot_master_ui
 
       - name: Saving new master ui
-        if: (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/master-new') && github.event_name == 'push'
+        if: github.ref == 'refs/heads/master' && github.event_name == 'push'
         working-directory: ${{ github.workspace }}/master_ui
         run: |
           git checkout --orphan=new_master_ui

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
 

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')

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