Merge pull request #255 from HumairAK/fix_odh_sync

Allow odh sync to fork from user fork.
opendatahub-io · Aug 4, 2023 · 462ef90 · 462ef90
2 parents 5bd0f8c + 40ce94c
commit 462ef90
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/.github/workflows/odh-manifests-PR-sync.yml b/.github/workflows/odh-manifests-PR-sync.yml
@@ -32,16 +32,19 @@ jobs:
           git clone \
             --depth=1 \
             --branch=master \
-            https://opendatahub-io:${{ secrets.ACCESS_TOKEN }}@github.com/$REPOSITORY \
+            https://dsp-developers:${{ secrets.ACCESS_TOKEN }}@github.com/$REPOSITORY \
             $FOLDER
           cd $FOLDER
 
           # Setup the committers identity.
           git config user.email "140449482+dsp-developers@users.noreply.github.com"
           git config user.name "dsp-developers"
 
+          git remote add upstream https://github.com/opendatahub-io/odh-manifests.git
+          git fetch upstream
+
           # Create a new feature branch for the changes.
-          git checkout -b $BRANCH_NAME
+          git checkout -B $BRANCH_NAME upstream/master
           echo "Created branch: $BRANCH_NAME"
 
           # Copy DSPO manifests. Using rsync to allow filtering of paths/files (e.g. like a .gitignore, hidden files, etc)
@@ -62,5 +65,6 @@ jobs:
             --title "Update DSP Operator manifests to $LATEST_TAG" \
             --head "$BRANCH_NAME" \
             --base "master"
+            --repo https://github.com/opendatahub-io/data-science-pipelines-operator
         env:
           GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}