Merge branch 'publish'

.gitlab-ci.yml

-image: ruby:latest
+image: ruby:3.2.2-bookworm
 
 stages:
   - build
   - deploy
 
 variables:
-  GEM_HOME: $CI_PROJECT_DIR/vendor/bundle
-
-cache:
-  paths:
-    - vendor/bundle
-
-before_script:
-  - bundle config set --local path 'vendor/bundle'
-  - bundle install
+  JEKYLL_ENV: production
+  LC_ALL: C.UTF-8
 
 build-page:
   stage: build
+  variables:
+    JEKYLL_ENV: production
+  before_script:
+    - gem install bundler
+    - bundle install
+    - wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 --no-verbose -O /usr/local/bin/yq
+    - chmod +x /usr/local/bin/yq
+    - chmod +x ./build-page.sh
   script:
     - |
-      if [[ "$CI_COMMIT_BRANCH" == "main" ]]; then
-        JEKYLL_ENV=production bundle exec jekyll build --config _config_draft.yml --destination public
-      elif [[ "$CI_COMMIT_BRANCH" == "publish" ]]; then
-        JEKYLL_ENV=production bundle exec jekyll build --config _config.yml --destination public
+      if [ "$CI_COMMIT_BRANCH" == "publish" ] || [ "$CI_COMMIT_BRANCH" == "main" ]; then
+        echo "Running on branch $CI_COMMIT_BRANCH"
+        ./build-page.sh "/" true
       else
-        echo "Branch is neither main nor publish. Skipping build."
-        exit 1
+        echo "Running on other branches"
+        ./build-page.sh /draft false
       fi
-    - echo "Listing contents of public directory:"
-    - ls -laR public
   artifacts:
     paths:
       - public
-    expire_in: 1 week
   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
   needs: ["build-page"]
-  rules:
-    - if: $CI_COMMIT_BRANCH == "main"
   script:
     - |
       curl -X POST https://mude.citg.tudelft.nl/hooks/website-deploy-draft \
@@ -56,12 +53,13 @@ deploy-draft:
   environment:
     name: draft
     url: https://mude.citg.tudelft.nl/2024/draft
+  rules:
+    - if: $CI_COMMIT_BRANCH == "main" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"
+      when: always
 
 deploy-production:
   stage: deploy
   needs: ["build-page"]
-  rules:
-    - if: $CI_COMMIT_BRANCH == "publish"
   script:
     - |
       curl -X POST https://mude.citg.tudelft.nl/hooks/website-deploy \
@@ -76,4 +74,7 @@ deploy-production:
         }'
   environment:
     name: production
-    url: https://mude.citg.tudelft.nl/2024
\ No newline at end of file
+    url: https://mude.citg.tudelft.nl/2024
+  rules:
+    - if: $CI_COMMIT_BRANCH == "publish" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "publish"
+      when: always

_config.yml

@@ -99,4 +99,5 @@ compress_html:
   blanklines: false
   profile: false
 
-draft_banner: "This is the DRAFT version of the MUDE 2024 website. Content may change frequently."
+is_draft: true
+draft_banner: "This is the DRAFT version of the MUDE 2024 website. Content may change frequently."
\ No newline at end of file