bec/ophyd_devices
0
0
Fork 0
mirror of https://github.com/bec-project/ophyd_devices.git synced 2026-01-16 15:29:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

ci: changed master to main

Browse Source
This commit is contained in:
wakonig_k
2024-04-19 13:33:36 +02:00
parent 8d68e7df70
commit 701be5262a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@@ -127,7 +127,7 @@ trigger_bec:
variables: variables:
OPHYD_DEVICES_BRANCH: $CI_COMMIT_REF_NAME OPHYD_DEVICES_BRANCH: $CI_COMMIT_REF_NAME
rules: rules:
- if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"' - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"'
semver: semver:
stage: Deploy stage: Deploy
@@ -153,4 +153,4 @@ semver:
allow_failure: false allow_failure: false
rules: rules:
- if: '$CI_COMMIT_REF_NAME == "master"' - if: '$CI_COMMIT_REF_NAME == "main"'

2
pyproject.toml
View File

@@ -42,7 +42,7 @@ ophyd_test = "ophyd_devices:launch"
"Bug Tracker" = "https://gitlab.psi.ch/bec/ophyd_devices/issues" "Bug Tracker" = "https://gitlab.psi.ch/bec/ophyd_devices/issues"
Homepage = "https://gitlab.psi.ch/bec/ophyd_devices" Homepage = "https://gitlab.psi.ch/bec/ophyd_devices"
documentation = "https://bec.readthedocs.org" 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] [tool.hatch.build.targets.wheel]
include = ["*"] include = ["*"]