File tree Expand file tree Collapse file tree 2 files changed +9
-6
lines changed
Expand file tree Collapse file tree 2 files changed +9
-6
lines changed Original file line number Diff line number Diff line change @@ -22,13 +22,17 @@ jobs:
2222 git remote add public https://x-access-token:${{ secrets.PRIVATE_REPO_ARLDM }}@github.com/utiasDSL/ARLDM-Advanced-Robot-Learning-And-Decision-Making.git
2323 git fetch public main
2424
25- - name : Pick new commits
25+ - name : Pick new commits (since lat repository publish)
2626 if : ${{ github.repository == 'utiasDSL/ARLDM-Advanced-Robot-Learning-And-Decision-Making' }}
2727 run : |
28- COMMITS=$(git log origin/main..public/main --invert-grep --grep='Publish repository' --pretty=format:"%H")
29- for c in $COMMITS; do
30- git cherry-pick $c || { echo "Cherry-pick failed for $c"; exit 1;" }
31- done
28+ LAST=$(git log origin/main..public/main --grep='Publish repository' --format='%H' | head -n1)
29+
30+ if [ -n "$LAST" ]; then
31+ git cherry-pick $LAST..public/main
32+ else
33+ git cherry-pick origin/main..public/main
34+ fi
35+
3236
3337 - name : Check for conflicts
3438 if : ${{ github.repository == 'utiasDSL/ARLDM-Advanced-Robot-Learning-And-Decision-Making' }}
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments