Skip to content

Commit

Permalink
[Chore] Make beta packages treated as rc
Browse files Browse the repository at this point in the history
Problem: New `beta` format of version was introduced, and
it still should be uploaded to the `rc` version repositories.

Solution: Make `rc` and `beta` treat the same way.
  • Loading branch information
krendelhoff2 committed Apr 21, 2023
1 parent ec8f3cd commit a5c71ad
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .buildkite/pipeline-raw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ steps:
- label: update RC mirror repository
if: |
build.branch == "master" &&
(build.message =~ /^Merge pull request .* from serokell\/auto\/v[0-9]+\.[0-9]+-rc.*-release/ ||
build.message =~ /^Merge pull request .* from serokell\/auto\/update-brew-formulae-v[.0-9]+-rc.*/)
(build.message =~ /^Merge pull request .* from serokell\/auto\/v[0-9]+\.[0-9]+-(rc|beta).*-release/ ||
build.message =~ /^Merge pull request .* from serokell\/auto\/update-brew-formulae-v[.0-9]+-(rc|beta).*/)
depends_on:
- "auto-release"
env:
Expand Down
4 changes: 3 additions & 1 deletion docker/package/package_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,9 @@ def main():
for package in packages:
if getattr(package, "letter_version", None) is None:
version = package.meta.version
repo = "tezos-rc" if "rc" in version else "tezos"
repo = (
"tezos-rc" if "rc" in version or "beta" in version else "tezos"
)
release = package.meta.release
name = package.name.lower()
# distributions list is always unempty at this point
Expand Down
2 changes: 1 addition & 1 deletion scripts/autorelease.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ for asset in "$assets_dir"/*; do
done

msg_regex="Merge pull request .* from serokell\/auto\/(v.*)-release"
rc_regex="^v[0-9]+\.[0-9]+-rc[0-9]+"
rc_regex="^v[0-9]+\.[0-9]+-(rc|beta)[0-9]+"

# We create a pre-release in any case except if we are merging a stable version release PR
mode_flag="--prerelease"
Expand Down
2 changes: 1 addition & 1 deletion scripts/publish-native-packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

octez_version = os.getenv("OCTEZ_VERSION", None)

if re.search("v.*-rc[0-9]*", octez_version):
if re.search("v.*-(rc|beta)[0-9]*", octez_version):
launchpad_ppa = "tezos-rc-serokell"
copr_project = "@Serokell/Tezos-rc"
else:
Expand Down

0 comments on commit a5c71ad

Please sign in to comment.