From 31ddc4889f22a0c7414f3b2937a319cc7aa5dc6e Mon Sep 17 00:00:00 2001 From: Samuel Attwood <45669855+samuelattwood@users.noreply.github.com> Date: Fri, 18 Feb 2022 16:38:09 -0500 Subject: [PATCH] Update pull-request.yaml Adding rebase to pull-request actions --- .github/workflows/pull-request.yaml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 2ffc47f66..4d9304ba3 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -11,15 +11,20 @@ jobs: steps: - uses: actions/checkout@v2 + with: + fetch-depth: 0 - name: Checkout into branch run: git checkout -b staging-pr-workflow + + - name: Fetch main-source + run: git fetch origin main-source + + - name: Rebase to main-source + run: git rebase origin/main-source - name: Pull scripts run: sudo make pull-scripts - - - name: Pull in all relevant branches - run: git fetch origin main - name: Validate - run: sudo make validate \ No newline at end of file + run: sudo make validate