From 7d0f683b1c69b1482fc5f2085dd037b8174919b8 Mon Sep 17 00:00:00 2001
From: Maxime Desroches <desroches.maxime@gmail.com>
Date: Mon, 12 Aug 2024 11:49:21 -0700
Subject: [PATCH] ci: merge python packages and python submodules bump (#33274)

merge packages and python submodules
old-commit-hash: 8515ac17647db10b31ff1ef85026345933a54cc6
---
 .github/workflows/repo-maintenance.yaml | 34 +++++--------------------
 1 file changed, 7 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/repo-maintenance.yaml b/.github/workflows/repo-maintenance.yaml
index 3893c7fa5e..78f64c03b1 100644
--- a/.github/workflows/repo-maintenance.yaml
+++ b/.github/workflows/repo-maintenance.yaml
@@ -6,33 +6,6 @@ on:
   workflow_dispatch:
 
 jobs:
-  bump_submodules:
-    name: bump_submodules
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/commaai/openpilot-base:latest
-    if: github.repository == 'commaai/openpilot'
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: true
-    - name: bump submodules
-      run: |
-        git config --global --add safe.directory '*'
-        git -c submodule."tinygrad".update=none submodule update --remote
-        git add .
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@9153d834b60caba6d51c9b9510b087acf9f33f83
-      with:
-        author: Vehicle Researcher <user@comma.ai>
-        token: ${{ secrets.ACTIONS_CREATE_PR_PAT }}
-        commit-message: bump submodules
-        title: '[bot] Bump submodules'
-        branch: auto-bump-submodules
-        base: master
-        delete-branch: true
-        body: 'Automatic PR from repo-maintenance -> bump_submodules'
-        labels: bot
   package_updates:
     name: package_updates
     runs-on: ubuntu-latest
@@ -41,11 +14,18 @@ jobs:
     if: github.repository == 'commaai/openpilot'
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: true
     - name: uv lock
       run: |
         python3 -m ensurepip --upgrade
         pip3 install uv
         uv lock --upgrade
+    - name: bump submodules
+      run: |
+        git config --global --add safe.directory '*'
+        git -c submodule."tinygrad".update=none submodule update --remote
+        git add .
     - name: Create Pull Request
       uses: peter-evans/create-pull-request@9153d834b60caba6d51c9b9510b087acf9f33f83
       with: