diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d1a1575a96e1514aff0631013cb9d37d79a994ed..0cbe50d58482078098ffb82b3fd8cd9948b4d458 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ image: python:3.10-bullseye variables: GIT_SUBMODULE_STRATEGY: normal - PREFERRED_BRANCH: "citadel" # Change this to your actual release branch name + PREFERRED_BRANCH: $PREFERRED_BRANCH MAIN_BRANCH: "main" stages: diff --git a/README.md b/README.md index c2666531a65334da18d7b97fced6fd1a301616a7..f4482131fd5482f55fa910f27ba36886165e715c 100644 --- a/README.md +++ b/README.md @@ -362,6 +362,10 @@ Also, the main branch should never have a valid gitlab-ci.yml that can publish p For that reason the tag `only:` on the main branch of the project should be set to a different name other than the main branch. On the main branch, the tag is set to `change-me`, you need to change all of the occurrences of this tag to the current branch name. +### 5. Update PREFERRED_BRANCH CI/CD variable + +To allow automatic propagation of changes from the newest release to the main, we need to update the value of `PREFERRED_BRANCH` variable to the name of the new release branch. + ### 5. Publishing When all of the previous steps are done, you can run the manual stage `pages`, which deploys the newest changes.