Skip to content

[GitHub Actions] Speed up push flow #37

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

Merged
jayhawk-commits merged 3 commits into from
May 14, 2025
Merged

[GitHub Actions] Speed up push flow #37

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
1f6d564
[GitHub Actions] Speed up push flow
jayhawk-commits May 14, 2025
d5bad4f
Merge branch 'develop' into users/jayhawk-commits/faster-subtree-push
jayhawk-commits May 14, 2025
a92e73f
[GitHub Actions] Use subtree split rejoins for performance.
jayhawk-commits May 14, 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
4 changes: 2 additions & 2 deletions .github/repos-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@
"url": "ROCm/rocPRIM",
"branch": "develop",
"category": "projects",
"auto_subtree_pull": true,
"auto_subtree_push": false,
"auto_subtree_pull": false,
"auto_subtree_push": true,
"enable_pr_fanout": false
},
{
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/update-subtrees.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ env:
MONOREPO_URL: github.com/ROCm/rocm-libraries.git
MONOREPO_BRANCH: develop

concurrency:
group: pr-fanout-${{ env.MONOREPO_BRANCH }}
cancel-in-progress: false

jobs:
synchronize-subtrees:
runs-on: ubuntu-24.04
Expand All @@ -32,6 +36,10 @@ jobs:
git config user.name "assistant-librarian[bot]"
git config user.email "assistant-librarian[bot]@users.noreply.github.com"

- name: Switch to the Monorepo branch
run: |
git checkout -B "${{ env.MONOREPO_BRANCH }}" "origin/${{ env.MONOREPO_BRANCH }}"

- name: Update Repositories in the Monorepo
run: |
has_errors=false
Expand All @@ -47,9 +55,12 @@ jobs:
}
fi
if [ "$enable_push" = true ]; then
git subtree push --prefix "${category}/${repo}" https://github.com/${url}.git $branch --quiet || {
git fetch origin subtrees/${repo}/${branch}
git subtree split --prefix="${category}/${repo}" -b subtrees/${repo}/${branch} --rejoin || {
has_errors=true
}
git push origin subtrees/${repo}/${branch}
git push https://github.com/${url}.git subtrees/${repo}/${branch}:${branch}
fi
done

Expand Down