diff --git a/apps/partner-sas/netlify.toml b/apps/partner-sas/netlify.toml index c57b7b6be..5a94c2e83 100644 --- a/apps/partner-sas/netlify.toml +++ b/apps/partner-sas/netlify.toml @@ -1,14 +1,14 @@ [build] -command = "export NEXT_PUBLIC_RELEASE_TAG=$(git tag -l 'v*' | sort -V | tail -n 1) && yarn test --filter=@scandic-hotels/partner-sas && yarn build --filter=@scandic-hotels/partner-sas" +command = "export NEXT_PUBLIC_RELEASE_TAG=$(git tag --merged HEAD --sort=-v:refname | grep '^v' | head -n 1) && yarn test --filter=@scandic-hotels/partner-sas && yarn build --filter=@scandic-hotels/partner-sas" publish = "apps/partner-sas/.next" ignore = "if [ -z ${CACHED_COMMIT_REF+x} ] ; then echo 'no CACHED_COMMIT_REF found' && false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF apps/partner-sas packages/booking-flow packages/common packages/trpc packages/design-system packages/typescript-config ; fi" [context.branch-deploy] -command = "export NEXT_PUBLIC_RELEASE_TAG=$(git tag -l 'v*' | sort -V | tail -n 1) && yarn test --filter=@scandic-hotels/partner-sas && yarn build --filter=@scandic-hotels/partner-sas" +command = "export NEXT_PUBLIC_RELEASE_TAG=$(git tag --merged HEAD --sort=-v:refname | grep '^v' | head -n 1) && yarn test --filter=@scandic-hotels/partner-sas && yarn build --filter=@scandic-hotels/partner-sas" [context.deploy-preview] -command = "export NEXT_PUBLIC_RELEASE_TAG=$(git tag -l 'v*' | sort -V | tail -n 1) && yarn test --filter=@scandic-hotels/partner-sas && yarn build --filter=@scandic-hotels/partner-sas" +command = "export NEXT_PUBLIC_RELEASE_TAG=$(git tag --merged HEAD --sort=-v:refname | grep '^v' | head -n 1) && yarn test --filter=@scandic-hotels/partner-sas && yarn build --filter=@scandic-hotels/partner-sas" [build.environment] # set TERM variable for terminal output diff --git a/apps/scandic-web/netlify.toml b/apps/scandic-web/netlify.toml index 5b3e32241..053feed61 100644 --- a/apps/scandic-web/netlify.toml +++ b/apps/scandic-web/netlify.toml @@ -1,14 +1,14 @@ [build] -command = "export NEXT_PUBLIC_RELEASE_TAG=$(git tag -l 'v*' | sort -V | tail -n 1) && yarn test --filter=@scandic-hotels/scandic-web && yarn build --filter=@scandic-hotels/scandic-web" +command = "export NEXT_PUBLIC_RELEASE_TAG=$(git tag --merged HEAD --sort=-v:refname | grep '^v' | head -n 1) && yarn test --filter=@scandic-hotels/scandic-web && yarn build --filter=@scandic-hotels/scandic-web" publish = "apps/scandic-web/.next" ignore = "if [ -z ${CACHED_COMMIT_REF+x} ] ; then echo 'no CACHED_COMMIT_REF found' && false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF apps/scandic-web packages/booking-flow packages/common packages/trpc packages/design-system packages/typescript-config ; fi" [context.branch-deploy] -command = "export NEXT_PUBLIC_RELEASE_TAG=$(git tag -l 'v*' | sort -V | tail -n 1) && yarn test --filter=@scandic-hotels/scandic-web && yarn build --filter=@scandic-hotels/scandic-web" +command = "export NEXT_PUBLIC_RELEASE_TAG=$(git tag --merged HEAD --sort=-v:refname | grep '^v' | head -n 1) && yarn test --filter=@scandic-hotels/scandic-web && yarn build --filter=@scandic-hotels/scandic-web" [context.deploy-preview] -command = "export NEXT_PUBLIC_RELEASE_TAG=$(git tag -l 'v*' | sort -V | tail -n 1) && yarn test --filter=@scandic-hotels/scandic-web && yarn build --filter=@scandic-hotels/scandic-web" +command = "export NEXT_PUBLIC_RELEASE_TAG=$(git tag --merged HEAD --sort=-v:refname | grep '^v' | head -n 1) && yarn test --filter=@scandic-hotels/scandic-web && yarn build --filter=@scandic-hotels/scandic-web" [[plugins]] package = "@netlify/plugin-nextjs"