From 66bc6f5f8439e2ece603d61bbf5fd860d901876a Mon Sep 17 00:00:00 2001 From: Andrei Jiroh Halili Date: Thu, 30 May 2024 15:28:25 +0800 Subject: [PATCH] build(gitlab-ci): :green_heart: iron out wrangler pages deploy commands Signed-off-by: Andrei Jiroh Halili --- bin/deploykit-pages.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/bin/deploykit-pages.sh b/bin/deploykit-pages.sh index 8585d34..834f1c1 100755 --- a/bin/deploykit-pages.sh +++ b/bin/deploykit-pages.sh @@ -28,9 +28,9 @@ info() { } if [[ $_branch_name_git == "main" ]] || [[ $_branch_name_git == "HEAD" ]]; then - export DEPLOY_COMMAND="npx wrangler pages deploy ${_root_directory_git}/public --project-name ${CF_PAGES_PROJECT_NAME} --branch main --commit-hash ${_commit_sha} --env production" + export DEPLOY_COMMAND="npx wrangler pages deploy ${_root_directory_git}/public --project-name ${CF_PAGES_PROJECT_NAME} --branch main --commit-hash ${_commit_sha}" elif [[ $CI_PIPELINE_SOURCE == "merge_request" ]]; then - export DEPLOY_COMMAND="npx wrangler pages deploy ${_root_directory_git}/public --project-name ${CF_PAGES_PROJECT_NAME} --branch ${_branch_name_git} --commit-hash ${_commit_sha} --env pr-$CI_MERGE_REQUEST_ID" + export DEPLOY_COMMAND="npx wrangler pages deploy ${_root_directory_git}/public --project-name ${CF_PAGES_PROJECT_NAME} --branch patch-$CI_MERGE_REQUEST_ID --commit-hash ${_commit_sha}" fi if ! git diff-index --quiet HEAD -- && [[ $FF_DIRTY_DEPLOY != "true" ]]; then @@ -47,17 +47,18 @@ fi if [[ $FF_DIRTY_DEPLOY == "true" ]]; then $DEPLOY_COMMAND --commit-dirty=true else - DEFAULT_COMMAND="npx wrangler pages publish ${_root_directory_git}/public --project-name ${CF_PAGES_PROJECT_NAME} --branch main --env production" + DEFAULT_COMMAND="npx wrangler pages publish ${_root_directory_git}/public --project-name ${CF_PAGES_PROJECT_NAME} --branch main" ${DEPLOY_COMMAND:-$DEFAULT_COMMAND} fi unset DEPLOY_COMMAND -if [[ $_branch_name_git == "main" ]] || [[ $_branch_name_git == "HEAD" ]]; then - tar -C public -cvz . -f site-build.tar.gz - curl --oauth2-bearer "$SOURCEHUT_PAGES_TOKEN" \ - -Fcontent=@site-build.tar.gz \ - "https://pages.sr.ht/publish/ajhalili2006.srht.site" -fi +# temporarily disabled +#if [[ $_branch_name_git == "main" ]] || [[ $_branch_name_git == "HEAD" ]]; then +# tar -C public -cvz . -f site-build.tar.gz +# curl --oauth2-bearer "$SOURCEHUT_PAGES_TOKEN" \ +# -Fcontent=@site-build.tar.gz \ +# "https://pages.sr.ht/publish/ajhalili2006.srht.site" +#fi if [[ $DEBUG != "" ]]; then set +x