Add job to rebase integration-candidate after push to main

.github/workflows/functional-tests.yml

@@ -110,4 +110,48 @@ jobs:
                   grep -i '\[ FAIL]\|\[  TSF]\|\[  TTF]' cf/cfe_test.log
                   exit -1
           fi
-        working-directory: ./build/exe/cpu1/
+        working-directory: ./build/exe/cpu1/
+
+  Merge-IC:
+    runs-on: ubuntu-latest
+    # Map a step output to a job output
+    needs: Local-Test-Build
+    if: github.event_name == 'pull_request'
+    steps: 
+
+      - name: Checkout submodule
+        uses: actions/checkout@v2    
+        with:    
+          ref: ${{ github.event.pull_request.head.sha }}
+
+
+      - name: merge and push
+        run: |         
+          git checkout -b temp
+          git log -1
+          git fetch origin integration-candidate          
+          git checkout integration-candidate
+          git log -1        
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+          git merge --allow-unrelated-histories --no-ff temp -m "Test Merge #${{ github.event.pull_request.number }}"
+          git log -1        
+          git push
+        
+
+  Rebase-IC:
+      # Anytime there's a push to main this rebases IC on top of main
+      if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
+      runs-on: ubuntu-18.04
+
+      steps:
+        - name: Checkout submodule
+          uses: actions/checkout@v2
+          with:
+            path: cfe
+
+        - name: Rebase IC
+          run: | 
+            git fetch origin
+            git rebase main
+            git push origin/integration-candidate