add rebase

ajainc · Dec 13, 2023 · 4812ca0 · 4812ca0
1 parent 8fb873d
commit 4812ca0
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/.github/workflows/upstream-fetcher.yml b/.github/workflows/upstream-fetcher.yml
@@ -45,14 +45,20 @@ jobs:
           push_args: ${{ env.PUSH_ARGS }}
           spawn_logs: ${{ env.SPAWN_LOGS }}
 
-      - name: Sync DO_NOT_MERGE_aja_staging
-        uses: dabreadman/sync-upstream-repo@v1.3.0
-        with:
-          upstream_repo: ${{ env.UPSTREAM_URL }}
-          upstream_branch: ${{ env.UPSTREAM_BRANCH }}
-          downstream_branch: DO_NOT_MERGE_aja_staging
-          token: ${{ env.WORKFLOW_TOKEN }}
-          fetch_args: ${{ env.FETCH_ARGS }}
-          merge_args: ${{ env.MERGE_ARGS }}
-          push_args: ${{ env.PUSH_ARGS }}
-          spawn_logs: ${{ env.SPAWN_LOGS }}
+      - name: Rebase DO_NOT_MERGE_aja_staging
+        run: |
+          git clone https://github.com/ajainc/Prebid.js.git work
+          cd work
+          git config user.name ajarobot
+          git config user.email ajarobot@users.noreply.github.com
+          git config --local user.password ${{ secrets.GITHUB_TOKEN }}
+          git remote set-url origin ***github.com/ajainc/Prebid.js.git
+          git remote add upstream https://github.com/prebid/Prebid.js.git
+          git fetch upstream
+          git remote -v
+          git switch DO_NOT_MERGE_aja_staging
+          git push origin
+          git rebase origin/master
+          git push origin DO_NOT_MERGE_aja_staging
+          cd ..
+          rm -rf work