Skip to content

Commit e2a6ecd

Browse files
authored
Merge pull request #775 from pulp/update-ci/main
Update CI files for branch main
2 parents 85b3398 + 81a599b commit e2a6ecd

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

.github/template_gitref

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2021.08.26-405-g3845bbc
1+
2021.08.26-406-g5f397e3

pyproject.toml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,33 @@ ignore = [
8080
current_version = "3.13.0.dev"
8181
commit = false
8282
tag = false
83-
parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"
83+
parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"
8484
serialize = [
85-
"{major}.{minor}.{patch}.{release}",
86-
"{major}.{minor}.{patch}",
85+
"{major}.{minor}.{patch}.{release}",
86+
"{major}.{minor}.{patch}",
87+
"{major}.{minor}.{alpha}{patch}.{release}",
88+
"{major}.{minor}.{alpha}{patch}",
8789
]
8890

91+
[tool.bumpversion.parts.alpha]
92+
# This section is managed by the plugin template. Do not edit manually.
93+
94+
# This is sort of a hack. In PEP440 prerelease markers work quite differently.
95+
# But this fits best with the way we have been doing release versions.
96+
optional_value = "final"
97+
values = [
98+
"0a",
99+
"final",
100+
]
101+
independent = true
102+
89103
[tool.bumpversion.parts.release]
90104
# This section is managed by the plugin template. Do not edit manually.
91105

92106
optional_value = "prod"
93107
values = [
94-
"dev",
95-
"prod",
108+
"dev",
109+
"prod",
96110
]
97111

98112
[[tool.bumpversion.files]]

0 commit comments

Comments
 (0)