Merge pull request #495 from contentstack/feature/workflow

workflow changes

Author: RohitKini

.github/workflows/repo-sync.yml

@@ -14,9 +14,9 @@ env:
   RSYNC_SITECORE_API_SRC_SERVICES_EXCLUDES: "--exclude 'src/services/contentful/' --exclude 'src/services/contentful.service.ts' --exclude 'src/services/wordpress.service.ts'" # Include only sitecore services
   RSYNC_CONTENTFUL_API_SRC_SERVICES_EXCLUDES: "--exclude 'src/services/wordpress.service.ts' --exclude 'src/services/sitecore.service.ts'" # Include only contentful services
   RSYNC_WORDPRESS_API_SRC_SERVICES_EXCLUDES: "--exclude 'src/services/contentful/' --exclude 'src/services/contentful.service.ts' --exclude 'src/services/sitecore.service.ts'" # Include only wordpress services
-  RSYNC_SITECORE_UPLOAD_API_SRC_EXCLUDES: "--exclude 'migration-contentful/' --exclude 'migration-wordpress/' --exclude 'controllers/wordpress/' --exclude 'models/contentful.json' --exclude 'models/wordpress.json' --exclude  'services/contentful/' --exclude  'validators/aem/' --exclude  'validators/contentful/' --exclude  'validators/wordpress/'" # Include only sitecore upload-api
-  RSYNC_CONTENTFUL_UPLOAD_API_SRC_EXCLUDES: "--exclude 'migration-sitecore/' --exclude 'migration-wordpress/' --exclude 'controllers/sitecore/' --exclude 'models/wordpress.json' --exclude  'validators/aem/' --exclude  'validators/sitecore/' --exclude  'validators/wordpress/'" # Include only contentful upload-api
-  RSYNC_WORDPRESS_UPLOAD_API_SRC_EXCLUDES: "--exclude 'migration-sitecore/' --exclude 'migration-contentful/' --exclude 'controllers/sitecore/' --exclude 'models/contentful.json' --exclude  'validators/aem/' --exclude  'validators/sitecore/' --exclude  'validators/contentful/'" # Include only wordpress upload-api
+  RSYNC_SITECORE_UPLOAD_API_SRC_EXCLUDES: "--exclude 'controllers/wordpress/' --exclude 'models/contentful.json' --exclude 'models/wordpress.json' --exclude  'services/contentful/' --exclude  'validators/aem/' --exclude  'validators/contentful/' --exclude  'validators/wordpress/'" # Include only sitecore upload-api
+  RSYNC_CONTENTFUL_UPLOAD_API_SRC_EXCLUDES: "--exclude 'controllers/sitecore/' --exclude 'models/wordpress.json' --exclude  'validators/aem/' --exclude  'validators/sitecore/' --exclude  'validators/wordpress/'" # Include only contentful upload-api
+  RSYNC_WORDPRESS_UPLOAD_API_SRC_EXCLUDES: "--exclude 'controllers/sitecore/' --exclude 'models/contentful.json' --exclude  'validators/aem/' --exclude  'validators/sitecore/' --exclude  'validators/contentful/'" # Include only wordpress upload-api
 jobs:
   sync-on-merge:
     runs-on: ubuntu-latest
@@ -57,7 +57,7 @@ jobs:
                     ui:
                         - 'ui/**'
                     upload-api:
-                        - 'upload-api/**'
+                        - 'upload-api/src/**'
                     migration-sitecore:
                         - 'upload-api/migration-sitecore/**'
                     migration-contentful:
@@ -88,6 +88,7 @@ jobs:
                 git clone https://x-access-token:${{ secrets.GH_PAT }}@github.com/${{ env.SITECORE_REPO }}.git
                 cd migration-tool-sitecore
                 git checkout -b sync-from-migration-v2-${{ github.event.pull_request.number }}
+                git pull origin ${{ env.BRANCH }}
                 rsync -av --delete ${{ env.RSYNC_SITECORE_API_SRC_SERVICES_EXCLUDES }} ../api/ ./api/
                 rsync -av --delete ../cli/ ./cli/
                 rsync -av --delete ../ui/ ./ui/
@@ -132,6 +133,7 @@ jobs:
                 git clone https://x-access-token:${{ secrets.GH_PAT }}@github.com/${{ env.CONTENTFUL_REPO }}.git
                 cd migration-tool-contentful
                 git checkout -b sync-from-migration-v2-${{ github.event.pull_request.number }}
+                git pull origin ${{ env.BRANCH }}
                 rsync -av --delete ${{ env.RSYNC_CONTENTFUL_API_SRC_SERVICES_EXCLUDES }} ../api/ ./api/
                 rsync -av --delete ../cli/ ./cli/
                 rsync -av --delete ../ui/ ./ui/
@@ -176,6 +178,7 @@ jobs:
                 git clone https://x-access-token:${{ secrets.GH_PAT }}@github.com/${{ env.WORDPRESS_REPO }}.git
                 cd migration-tool-wordpress
                 git checkout -b sync-from-migration-v2-${{ github.event.pull_request.number }}
+                git pull origin ${{ env.BRANCH }}
                 rsync -av --delete ${{ env.RSYNC_WORDPRESS_API_SRC_SERVICES_EXCLUDES }} ../api/ ./api/
                 rsync -av --delete ../cli/ ./cli/
                 rsync -av --delete ../ui/ ./ui/