diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 536354a4ff009ef8dc701cf86479c7047001a36e..17574168b8903c18ac69202abece844ffb3926f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,14 +25,10 @@ build-page: else ./build-page.sh "/draft" false fi - artifacts: paths: - public - rules: - - if: $CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "publish" - - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "publish" - when: always + deploy-draft: stage: deploy diff --git a/build-page.sh b/build-page.sh index 55229b7cf2843f24867d0a73cba08c66904ebeb2..ba649a3cfe5cfd44ee836a44e4ae4a44cf5b7199 100644 --- a/build-page.sh +++ b/build-page.sh @@ -14,6 +14,7 @@ if [ "$IS_PUBLISH_DEPLOYMENT" = true ]; then else cp _config.yml _config.yml.bak yq -i '.is_draft = false' _config.yml + echo "is_draft set to false in _config.yml" fi else echo "Using draft deployment strategy" @@ -24,8 +25,17 @@ else else cp _config.yml _config.yml.bak yq -i '.is_draft = true' _config.yml + echo "is_draft set to true in _config.yml" fi fi echo "Publishing to page root: \"$PAGE_ROOT\"" bundle exec jekyll build -d public -b "$PAGE_ROOT" + +# Check the build result +if [ $? -ne 0 ]; then + echo "Jekyll build failed" + exit 1 +else + echo "Jekyll build succeeded" +fi