From f55a847822c7235e42402ecb5ea0305c35cbe65a Mon Sep 17 00:00:00 2001
From: Kwangjin Lee <k.lee-5@student.tudelft.nl>
Date: Fri, 23 Aug 2024 15:55:01 +0200
Subject: [PATCH] Update 2 files
- /build-page.sh
- /.gitlab-ci.yml
---
.gitlab-ci.yml | 6 +-----
build-page.sh | 10 ++++++++++
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 536354a..1757416 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 55229b7..ba649a3 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
--
GitLab