From 52229040c64252ceddcee57a27c81d97dca595f6 Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 21 Aug 2025 23:37:44 -0600 Subject: [PATCH] Fix GitLab Pages special behavior - Rename main deployment job to 'deploy' (runs on all branches) - Keep 'pages' job for GitLab Pages (only runs on main branch) - Ghost-upload jobs now depend on 'deploy' instead of 'pages' - Fixes pipeline creation issues on feature branches --- .gitlab-ci.yml | 15 ++++++++++++++- ghost-upload/.gitlab-ci.yml | 4 ++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 40b357e..e336fb0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ staging: paths: - public -pages: +deploy: stage: deploy script: - echo "Publishing site..." @@ -32,5 +32,18 @@ pages: paths: - public +# GitLab Pages deployment (only on main branch) +pages: + stage: deploy + script: + - echo "Publishing to GitLab Pages..." + needs: + - deploy + artifacts: + paths: + - public + rules: + - if: "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH" + include: - local: ghost-upload/.gitlab-ci.yml diff --git a/ghost-upload/.gitlab-ci.yml b/ghost-upload/.gitlab-ci.yml index 1271483..b5d4519 100644 --- a/ghost-upload/.gitlab-ci.yml +++ b/ghost-upload/.gitlab-ci.yml @@ -10,7 +10,7 @@ publish: - cd ./ghost-upload - cargo run needs: - - pages + - deploy # Manual trigger to force update all Ghost posts force-update-ghost: @@ -21,7 +21,7 @@ force-update-ghost: - cd ./ghost-upload - FORCE_UPDATE=true cargo run needs: - - pages + - deploy rules: - when: manual allow_failure: false