File tree Expand file tree Collapse file tree 1 file changed +5
-4
lines changed
Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -27,16 +27,17 @@ jobs:
2727 - name : Find latest stable tag for branch
2828 id : latest_tag
2929 run : |
30- tag=$(git tag -l 'v6.12.*' --sort=-v:refname | head -1)
30+ version=$(echo ${{ github.ref_name }} | sed 's/^linux-nvidia-//')
31+ tag=$(git describe --abbrev=0 --tags upstream/linux-${version}.y)
3132 echo "tag=$tag" >> $GITHUB_OUTPUT
3233
3334 - name : Fetch patch branch
34- run : git fetch origin linux-nvidia-6.12
35+ run : git fetch origin ${{ github.ref_name }}
3536
3637 - name : Find merge base between patch branch and updated LTS
3738 id : merge_base
3839 run : |
39- base=$(git merge-base origin/linux-nvidia-6.12 ${{ steps.latest_tag.outputs.tag }})
40+ base=$(git merge-base origin/${{ github.ref_name }} ${{ steps.latest_tag.outputs.tag }})
4041 echo "base=$base" >> $GITHUB_OUTPUT
4142
4243 - name : Create new branch for rebased patches
5455
5556 - name : Push rebased patch branch
5657 run : |
57- git push origin HEAD:linux-nvidia-6.12 -${{ steps.latest_tag.outputs.tag }}
58+ git push --force origin HEAD:${{ github.ref_name }} -${{ steps.latest_tag.outputs.tag }}
You can’t perform that action at this time.
0 commit comments