File tree Expand file tree Collapse file tree 1 file changed +9
-6
lines changed
Expand file tree Collapse file tree 1 file changed +9
-6
lines changed Original file line number Diff line number Diff line change 88 required : false
99 default : " normal"
1010
11+ env :
12+ BRANCH : ${{ github.ref_name }}
13+
1114jobs :
1215 merge-check :
1316 runs-on : ubuntu-latest
@@ -24,20 +27,20 @@ jobs:
2427 git config user.email "github-actions[bot]@noreply.github.com"
2528
2629 git remote add public https://x-access-token:${{ secrets.PRIVATE_REPO_ARLDM }}@github.com/utiasDSL/ARLDM-Advanced-Robot-Learning-And-Decision-Making.git
27- git fetch public ${{ github.ref_name }}
30+ git fetch public $BRANCH
2831
29- git checkout -b public_sync-${{ github.ref_name }} origin/main
32+ git checkout -b public_sync-$BRANCH origin/main
3033
3134 - name : Pick new commits (since lat repository publish)
3235 if : ${{ github.repository == 'utiasDSL/ARLDM-Advanced-Robot-Learning-And-Decision-Making' }}
3336 working-directory : Advanced-Robot-Learning-and-Decision-Making-Programming-Exercises
3437 run : |
35- LAST=$(git log origin/main..public/${{ github.ref_name }} --grep='Publish repository' --format='%H' | head -n1)
38+ LAST=$(git log origin/main..public/$BRANCH --grep='Publish repository' --format='%H' | head -n1)
3639
3740 if [ -n "$LAST" ]; then
38- RANGE="$LAST..public/main "
41+ RANGE="$LAST..public/$BRANCH "
3942 else
40- RANGE="origin/main..public/main "
43+ RANGE="origin/main..public/$BRANCH "
4144 fi
4245 if git rev-list --count $RANGE | grep -qv '^0$'; then
4346 git cherry-pick $RANGE
@@ -120,4 +123,4 @@ jobs:
120123 if [[ "${{ github.event.inputs.admin_key }}" != "${{ secrets.ADMIN_KEY }}" ]]; then
121124 exit 0
122125 fi
123- git push origin public_sync-${{ github.ref_name }} --force
126+ git push origin public_sync-$BRANCH --force
You can’t perform that action at this time.
0 commit comments