From 9362d09730ef6e7dc2c65d4ea505473f046af347 Mon Sep 17 00:00:00 2001 From: Linus Flood Date: Tue, 12 Aug 2025 11:56:17 +0000 Subject: [PATCH] Merged in fix/branch-sync (pull request #2625) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(branch sync): check if cached commit ref exists before ignoring builds * fix(branch sync): check if cached commit ref exists before ignoring builds Approved-by: Joakim Jäderberg --- apps/partner-sas/netlify.toml | 3 ++- apps/scandic-redirect/netlify.toml | 4 +++- apps/scandic-web/netlify.toml | 3 ++- packages/design-system/netlify.toml | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/partner-sas/netlify.toml b/apps/partner-sas/netlify.toml index 8d2f7bab5..a117fccb8 100644 --- a/apps/partner-sas/netlify.toml +++ b/apps/partner-sas/netlify.toml @@ -1,7 +1,8 @@ [build] command = "yarn test && yarn build:sas" publish = "apps/partner-sas/.next" -ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF apps/partner-sas packages/common packages/trpc packages/design-system packages/typescript-config" + +ignore = "if [[ -v $CACHED_COMMIT_REF ]] ; 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 09dc97c1c..4d2871646 100644 --- a/apps/scandic-redirect/netlify.toml +++ b/apps/scandic-redirect/netlify.toml @@ -1,5 +1,7 @@ [build] -ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF apps/scandic-redirect" + +ignore = "if [[ -v $CACHED_COMMIT_REF ]] ; 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 677e1b788..2b59c9850 100644 --- a/apps/scandic-web/netlify.toml +++ b/apps/scandic-web/netlify.toml @@ -1,7 +1,8 @@ [build] command = "yarn test && yarn build:web" publish = "apps/scandic-web/.next" -ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF apps/scandic-web packages/common packages/trpc packages/design-system packages/typescript-config" + +ignore = "if [[ -v $CACHED_COMMIT_REF ]] ; 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 c93774514..d4140d8f4 100644 --- a/packages/design-system/netlify.toml +++ b/packages/design-system/netlify.toml @@ -1,2 +1,2 @@ [build] -ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF packages/design-system packages/typescript-config" \ No newline at end of file +ignore = "if [[ -v $CACHED_COMMIT_REF ]] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF packages/design-system packages/typescript-config ; fi" \ No newline at end of file