From 83256695db581d365d79177166b49adeac76fa85 Mon Sep 17 00:00:00 2001
From: Linus Flood <linus.flood@scandichotels.com>
Date: Wed, 13 Aug 2025 11:59:28 +0000
Subject: [PATCH] Merged in fix/branch-sync-2 (pull request #2640)

Fix/branch sync 2

* feat(branch sync)-fixed ignore script

* feat(branch sync)-fixed ignore script

* merge master
---
 apps/partner-sas/netlify.toml       | 3 +--
 apps/scandic-redirect/netlify.toml  | 3 +--
 apps/scandic-web/netlify.toml       | 3 +--
 packages/design-system/netlify.toml | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/apps/partner-sas/netlify.toml b/apps/partner-sas/netlify.toml
index 04dd1b88b..a78db181c 100644
--- a/apps/partner-sas/netlify.toml
+++ b/apps/partner-sas/netlify.toml
@@ -2,8 +2,7 @@
 command = "yarn test && yarn build:sas"
 publish = "apps/partner-sas/.next"
 
-ignore = "if [ -z ${CACHED_COMMIT_REF+x} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF apps/partner-sas packages/common packages/trpc packages/design-system packages/typescript-config ; fi"
-
+ignore = "[ -n "$CACHED_COMMIT_REF" ] && git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF apps/scandic-web packages/common packages/trpc packages/design-system packages/typescript-config"
 [context.branch-deploy]
 command = "yarn test && yarn build:sas"
 
diff --git a/apps/scandic-redirect/netlify.toml b/apps/scandic-redirect/netlify.toml
index 66667f7c4..8856de698 100644
--- a/apps/scandic-redirect/netlify.toml
+++ b/apps/scandic-redirect/netlify.toml
@@ -1,7 +1,6 @@
 [build]
 
-ignore = "if [ -z ${CACHED_COMMIT_REF+x} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF apps/scandic-redirect ; fi"
-
+ignore = "[ -n "$CACHED_COMMIT_REF" ] && git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF apps/scandic-redirect"
 
 [functions]
   included_files = ["netlify/functions/data/**.json"]
diff --git a/apps/scandic-web/netlify.toml b/apps/scandic-web/netlify.toml
index b8d0c4195..d27e43482 100644
--- a/apps/scandic-web/netlify.toml
+++ b/apps/scandic-web/netlify.toml
@@ -2,8 +2,7 @@
 command = "yarn test && yarn build:web"
 publish = "apps/scandic-web/.next"
 
-ignore = "if [ -z ${CACHED_COMMIT_REF+x} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF apps/scandic-web packages/common packages/trpc packages/design-system packages/typescript-config ; fi"
-
+ignore = "[ -n "$CACHED_COMMIT_REF" ] && git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF apps/scandic-web packages/common packages/trpc packages/design-system packages/typescript-config"
 [context.branch-deploy]
 command = "yarn test && yarn build:web"
 
diff --git a/packages/design-system/netlify.toml b/packages/design-system/netlify.toml
index 4ed24c3f6..e38b567b5 100644
--- a/packages/design-system/netlify.toml
+++ b/packages/design-system/netlify.toml
@@ -1,2 +1,2 @@
 [build]
-ignore = "if [ -z ${CACHED_COMMIT_REF+x} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF packages/design-system packages/typescript-config ; fi"
\ No newline at end of file
+ignore = "[ -n "$CACHED_COMMIT_REF" ] && git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF packages/design-system packages/typescript-config"
\ No newline at end of file