From 2bf1d8e22bb8553f331c56867306cd8dd6f27171 Mon Sep 17 00:00:00 2001 From: Linus Flood Date: Wed, 13 Aug 2025 12:19:56 +0000 Subject: [PATCH] Merged in fix/branch-sync-2 (pull request #2642) Fix/branch sync 2 * feat(branch sync)-fixed ignore script * feat(branch sync)-fixed ignore script * merge master * Merge branch 'master' into fix/branch-sync-2 * Revert branch sync --- 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, 7 insertions(+), 4 deletions(-) diff --git a/apps/partner-sas/netlify.toml b/apps/partner-sas/netlify.toml index a78db181c..04dd1b88b 100644 --- a/apps/partner-sas/netlify.toml +++ b/apps/partner-sas/netlify.toml @@ -2,7 +2,8 @@ command = "yarn test && yarn build:sas" publish = "apps/partner-sas/.next" -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" +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" + [context.branch-deploy] command = "yarn test && yarn build:sas" diff --git a/apps/scandic-redirect/netlify.toml b/apps/scandic-redirect/netlify.toml index 8856de698..66667f7c4 100644 --- a/apps/scandic-redirect/netlify.toml +++ b/apps/scandic-redirect/netlify.toml @@ -1,6 +1,7 @@ [build] -ignore = "[ -n "$CACHED_COMMIT_REF" ] && git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF apps/scandic-redirect" +ignore = "if [ -z ${CACHED_COMMIT_REF+x} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF apps/scandic-redirect ; fi" + [functions] included_files = ["netlify/functions/data/**.json"] diff --git a/apps/scandic-web/netlify.toml b/apps/scandic-web/netlify.toml index d27e43482..b8d0c4195 100644 --- a/apps/scandic-web/netlify.toml +++ b/apps/scandic-web/netlify.toml @@ -2,7 +2,8 @@ command = "yarn test && yarn build:web" publish = "apps/scandic-web/.next" -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" +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" + [context.branch-deploy] command = "yarn test && yarn build:web" diff --git a/packages/design-system/netlify.toml b/packages/design-system/netlify.toml index e38b567b5..4ed24c3f6 100644 --- a/packages/design-system/netlify.toml +++ b/packages/design-system/netlify.toml @@ -1,2 +1,2 @@ [build] -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 +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