Skip to content

rebase #650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 24, 2025
Merged

rebase #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions .github/workflows/repo-sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
1 change: 1 addition & 0 deletions api/src/services/contentful.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading