diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b38613..15f0ab4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,7 +127,7 @@ trigger_bec: variables: OPHYD_DEVICES_BRANCH: $CI_COMMIT_REF_NAME rules: - - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"' + - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"' semver: stage: Deploy @@ -153,4 +153,4 @@ semver: allow_failure: false rules: - - if: '$CI_COMMIT_REF_NAME == "master"' + - if: '$CI_COMMIT_REF_NAME == "main"' diff --git a/pyproject.toml b/pyproject.toml index 57c3f1f..c0b655a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,7 +42,7 @@ ophyd_test = "ophyd_devices:launch" "Bug Tracker" = "https://gitlab.psi.ch/bec/ophyd_devices/issues" Homepage = "https://gitlab.psi.ch/bec/ophyd_devices" documentation = "https://bec.readthedocs.org" -changelog = "https://gitlab.psi.ch/bec/ophyd_devices/blob/master/CHANGELOG.md" +changelog = "https://gitlab.psi.ch/bec/ophyd_devices/blob/main/CHANGELOG.md" [tool.hatch.build.targets.wheel] include = ["*"]