Skip to content

Daily submodule bump automation #2252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ammallya wants to merge 3 commits into from
Closed

Daily submodule bump automation #2252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77ded4b
Adding dependabot submodule bump
ammallya Nov 21, 2025
2372f7d
Workflow to update rocm-libraries submodule
ammallya Nov 21, 2025
4b82aa1
Adding missed rocm-systems submodule
ammallya Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Copy link
Member

@ScottTodd ScottTodd Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's split this into two pull requests.

  1. Dependabot for most submodules
  2. The new script just for rocm-libraries

Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,20 @@ updates:
github-actions:
patterns:
- "*"
- package-ecosystem: "gitsubmodule"
directory: "/"
Copy link
Member

@ScottTodd ScottTodd Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pre-commit reported trailing whitespace here: https://github.com/ROCm/TheRock/actions/runs/19575710699/job/56060310982?pr=2252#step:4:168

pre-commit hook(s) made changes.
If you are seeing this message in CI, reproduce locally with: `pre-commit run --all-files`.
To run `pre-commit` as part of git workflow, use `pre-commit install`.
All changes made by hooks:
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index dcef9f2..18354f0 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -11,7 +11,7 @@ updates:
         patterns:
           - "*"
   - package-ecosystem: "gitsubmodule"
-    directory: "/"        
+    directory: "/"
     schedule:
       interval: "daily"
     target-branch: "main"
Error: Process completed with exit code 1.

You can install pre-commit to fix such issues for you on each commit: https://github.com/ROCm/TheRock/blob/main/CONTRIBUTING.md#pre-commit-checks

schedule:
interval: "daily"
target-branch: "main"
allow:
- dependency-name: "half"
- dependency-name: "HIPIFY"
- dependency-name: "rccl"
- dependency-name: "rccl-tests"
- dependency-name: "rocprof-trace-decoder"
- dependency-name: "rocm-cmake"
- dependency-name: "rocm-systems"
Comment on lines +18 to +25
Copy link
Member

@ScottTodd ScottTodd Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should split these into separate groups per component, if dependabot allows it.

Specifically:

component projects notes
comm-libs rccl, rccl-tests
systems (core, etc.) rocm-systems
base half, rocm-cmake
compiler hipify Remove from dependabot, updates are managed by the compiler team together with amd-llvm
profiler rocprof-trace-decoder

Please test if that is possible, perhaps with code like

  # comm-libs
  - package-ecosystem: "gitsubmodule"
    directory: "/"        
    schedule:
      interval: "daily"
    target-branch: "main"
    allow:
      - dependency-name: "rccl"
      - dependency-name: "rccl-tests"

  # systems
  - package-ecosystem: "gitsubmodule"
    directory: "/"        
    schedule:
      interval: "daily"
    target-branch: "main"
    allow:
      - dependency-name: "rocm-systems"

We could also start with just rocm-systems on its own, as that is the highest priority submodule in this list to keep continuously up to date.

reviewers:
- "ScottTodd"
- "marbre"
Comment on lines +26 to +28
Copy link
Member

@ScottTodd ScottTodd Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine to start as you have this now, but we should add a github team or some labels to help with review, rather than tag individual maintainers like this.

Copy link

@amd-shiraz amd-shiraz Nov 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

//testing PR review// Agree on having this reviewers centralized. we can have two approach:

  1. move reviewers field outside to some CODEOWNERS.yaml and maintain it there in code.
  2. low hanging would be to have teams setup in github as suggested by @ScottTodd

open-pull-requests-limit: 10
58 changes: 58 additions & 0 deletions .github/workflows/bump_submodule.yml
View file
Open in desktop
Copy link
Member

@ScottTodd ScottTodd Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Per my other comment, can you move the changes here into a second PR?

Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Bump rocm-libraries submodule

on:
workflow_dispatch:
schedule:
- cron: "0 11 * * *"

permissions:
contents: write
pull-requests: write

jobs:
bump-submodules:
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
with:
python-version: '3.12'

- name: Run bump submodules script
run: |
git config --global user.name "therockbot"
git config --global user.email "[email protected]"
DATE=$(LC_ALL=C date +%Y%m%d)
python3 ./build_tools/bump_submodules.py \
--components rocm-libraries \
--push-branch \
--branch-name github-actions/bump-rocm-libs-$DATE
- name: Generate GitHub App token
id: generate-token
uses: actions/create-github-app-token@b36a0b4db3c4ce0a0d11a8d6c20d7b19d4c89d2f # v2.1.0
with:
app-id: ${{ secrets.PULL_REQUEST_APP_ID }}
private-key: ${{ secrets.PULL_REQUEST_APP_KEY }}

- name: Create pull request
Copy link
Member

@ScottTodd ScottTodd Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you share a PR this created so we can inspect it? Did test here or on your fork somewhere? I don't see any notes in the PR description to that effect.

env:
GH_TOKEN: ${{ steps.generate-token.outputs.token }}
run: |
DATE=$(LC_ALL=C date +%Y%m%d)
BRANCH_NAME=github-actions/bump-rocm-libs-$DATE
TITLE="rocm-libraries Submodule Bump ${DATE}"
BODY="- Updating rocm-libraries"
Copy link
Member

@ScottTodd ScottTodd Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(For future work) We may want some extra text in the body, like

Update to https://github.com/ROCm/rocm-libraries/commit/d76850c823f237e689d9c22b0181c5c1d51099c0

We could have the https://github.com/ROCm/TheRock/blob/main/build_tools/bump_submodules.py script generate a commit message and then use that commit message as the PR title. See the code here:

TheRock/build_tools/bump_submodules.py

Lines 154 to 157 in 57e417d

exec(
["git", "commit", "-a", "-m", "Bump submodules " + date],
cwd=THEROCK_DIR,
)

Copy link
Contributor Author

@ammallya ammallya Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it will fix and create a PR today for all the notes mentioned

echo "Creating PR:"
echo " Branch: $BRANCH_NAME"
echo " Title: $TITLE"
gh pr create \
--base main \
--head "$BRANCH_NAME" \
--title "$TITLE" \
--body "$BODY"
Loading