From 5aacf7f836a4abe1a9cce304eefa044a34b70957 Mon Sep 17 00:00:00 2001 From: Agusti Fernandez Pardo Date: Sun, 3 Apr 2022 19:46:15 +0200 Subject: [PATCH 1/3] no branch to clone, git diff dont ignore api, ignore website --- scripts/vercel-deploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/vercel-deploy.sh b/scripts/vercel-deploy.sh index 4a39147366..268021c61b 100755 --- a/scripts/vercel-deploy.sh +++ b/scripts/vercel-deploy.sh @@ -1,5 +1,5 @@ # github submodule repo addresses without https:// prefix -BRANCH_TO_CLONE="feat/api-keys" +BRANCH_TO_CLONE="" # This didn't work ¯\_(ツ)_/¯ # declare -A remotes=( @@ -84,7 +84,7 @@ for submodule in $submodules; do rm -rf tmp # remove the tmp folder done -git diff --quiet HEAD^ HEAD ':!/apps/docs/*' ':!/apps/api/*' ':!/apps/web/*' +git diff --quiet HEAD^ HEAD ':!/apps/docs/*' ':!/apps/website/*' ':!/apps/web/*' echo "✅ - Build can proceed" exit 1 \ No newline at end of file From 2172fd96c00c254fe14a159750fbb4022be00ae0 Mon Sep 17 00:00:00 2001 From: Agusti Fernandez Pardo Date: Sun, 3 Apr 2022 19:48:19 +0200 Subject: [PATCH 2/3] add back branch to clone passing -b before --- scripts/vercel-deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/vercel-deploy.sh b/scripts/vercel-deploy.sh index 268021c61b..a18972826e 100755 --- a/scripts/vercel-deploy.sh +++ b/scripts/vercel-deploy.sh @@ -1,5 +1,5 @@ # github submodule repo addresses without https:// prefix -BRANCH_TO_CLONE="" +BRANCH_TO_CLONE="-b feat/api-keys" # This didn't work ¯\_(ツ)_/¯ # declare -A remotes=( From a2b8b85de46059ae7b084df7968b24f143852401 Mon Sep 17 00:00:00 2001 From: Agusti Fernandez Pardo Date: Sun, 3 Apr 2022 19:50:53 +0200 Subject: [PATCH 3/3] no commit in website --- scripts/vercel-deploy.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/vercel-deploy.sh b/scripts/vercel-deploy.sh index a18972826e..2c801645a1 100755 --- a/scripts/vercel-deploy.sh +++ b/scripts/vercel-deploy.sh @@ -54,7 +54,6 @@ for submodule in $submodules; do # SUBMODULE_GITHUB=$remotes[$SUBMODULE_PATH] if [ "$SUBMODULE_PATH" == "apps/website" ]; then SUBMODULE_GITHUB=github.com/calcom/website - COMMIT=$VERCEL_GIT_COMMIT_SHA fi if [ "$SUBMODULE_PATH" == "apps/api" ]; then