diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index 77571e44..81716e20 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -145,7 +145,10 @@ jobs: rsync -av --delete ${{ env.RSYNC_SITECORE_UPLOAD_API_SRC_EXCLUDES }} ../upload-api/src/ ./upload-api/src/ rsync -av --delete ../upload-api/migration-sitecore/ ./upload-api/migration-sitecore/ node remove-broken-imports.js - + if [ -z "$(git status --porcelain)" ]; then + echo "No changes to commit. Skipping push." + exit 0 + fi git add . git commit -m "Sync changes from migration-v2 PR #${{ github.event.pull_request.number }}" git push origin sync-from-migration-v2-${{ github.event.pull_request.number }} @@ -250,7 +253,10 @@ jobs: rsync -av --delete ${{ env.RSYNC_CONTENTFUL_UPLOAD_API_SRC_EXCLUDES }} ../upload-api/src/ ./upload-api/src/ rsync -av --delete ../upload-api/migration-contentful/ ./upload-api/migration-contentful/ node remove-broken-imports.js - + if [ -z "$(git status --porcelain)" ]; then + echo "No changes to commit. Skipping push." + exit 0 + fi git add . git commit -m "Sync changes from migration-v2 PR #${{ github.event.pull_request.number }}" git push origin sync-from-migration-v2-${{ github.event.pull_request.number }} @@ -354,7 +360,10 @@ jobs: rsync -av --delete ${{ env.RSYNC_WORDPRESS_UPLOAD_API_SRC_EXCLUDES }} ../upload-api/src/ ./upload-api/src/ rsync -av --delete ../upload-api/migration-wordpress/ ./upload-api/migration-wordpress/ node remove-broken-imports.js - + if [ -z "$(git status --porcelain)" ]; then + echo "No changes to commit. Skipping push." + exit 0 + fi git add . git commit -m "Sync changes from migration-v2 PR #${{ github.event.pull_request.number }}" git push origin sync-from-migration-v2-${{ github.event.pull_request.number }} diff --git a/api/src/services/contentful.service.ts b/api/src/services/contentful.service.ts index fb220820..62cf4e5b 100644 --- a/api/src/services/contentful.service.ts +++ b/api/src/services/contentful.service.ts @@ -14,6 +14,7 @@ import jsonRTE from "./contentful/jsonRTE.js"; import { getAllLocales, getLogMessage } from "../utils/index.js"; import customLogger from "../utils/custom-logger.utils.js"; + const { DATA, // DIR