diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ba11f88475643c7f44b28f4bc5ce81359d3ac4f..b2c99e6338406b37eeabd0186da060edc4d9a928 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,8 +27,8 @@ build: deploy: stage: deploy - only: - - /^master$/ + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH needs: - build variables: diff --git a/mkdocs.yml b/mkdocs.yml index 5bbe141f45909f4713b7d8bd91f3acc40aca97b2..b80ba170a9d537b4bd2ccb57ef69d7fd4bafa9a6 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -3,7 +3,7 @@ site_url: https://cmsgemonline.web.cern.ch/doc/ repo_url: https://gitlab.cern.ch/cmsgemonline/gem-ops/gem-daq-doc repo_name: gem-daq-doc -edit_uri: edit/master/docs/ +edit_uri: edit/main/docs/ theme: name: material