fix: remove python comparison (#4925)
This commit is contained in:
committed by
GitHub
parent
415ca7c8b1
commit
73b6a04541
@@ -1,88 +0,0 @@
|
||||
#!/usr/bin/python3
|
||||
import sys
|
||||
from typing import Optional
|
||||
from dataclasses import dataclass
|
||||
|
||||
|
||||
@dataclass
|
||||
class Version:
|
||||
major: int
|
||||
minor: int
|
||||
patch: int
|
||||
pre_release_tag: Optional[str] = None
|
||||
build_number: Optional[int] = None
|
||||
|
||||
@property
|
||||
def pre_release_priority(self) -> int:
|
||||
if self.pre_release_tag == "alpha":
|
||||
return 1
|
||||
if self.pre_release_tag == "beta":
|
||||
return 2
|
||||
return 10
|
||||
|
||||
@staticmethod
|
||||
def parse_version_slug(version_slug: str) -> "Version":
|
||||
members = version_slug.split(".")
|
||||
assert 3 <= len(members) <= 4
|
||||
if len(members) == 3:
|
||||
major, minor, patch = members
|
||||
return Version(int(major), int(minor), int(patch))
|
||||
|
||||
else:
|
||||
major, minor, patch_and_pre, build = members
|
||||
patch, pre = patch_and_pre.split("-")
|
||||
return Version(int(major), int(minor), int(patch), pre, int(build))
|
||||
|
||||
def __gt__(self, other):
|
||||
if not isinstance(other, Version):
|
||||
raise ValueError(f"cannot compare with {other}")
|
||||
|
||||
if self.major > other.major:
|
||||
return True
|
||||
if self.major < other.major:
|
||||
return False
|
||||
|
||||
if self.minor > other.minor:
|
||||
return True
|
||||
if self.minor < other.minor:
|
||||
return False
|
||||
|
||||
if self.patch > other.patch:
|
||||
return True
|
||||
if self.patch < other.patch:
|
||||
return False
|
||||
|
||||
if self.pre_release_tag == other.pre_release_tag:
|
||||
if self.build_number > other.build_number:
|
||||
return True
|
||||
if self.build_number < other.build_number:
|
||||
return False
|
||||
|
||||
if self.pre_release_priority > other.pre_release_priority:
|
||||
return True
|
||||
if self.pre_release_priority < other.pre_release_priority:
|
||||
return False
|
||||
|
||||
return True
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
print("\nStarting version compare\n")
|
||||
args = sys.argv[1:]
|
||||
assert len(args) == 2
|
||||
|
||||
current_version_slug, target_version_slug = args
|
||||
|
||||
print(
|
||||
f"comparing current version {current_version_slug} with target {target_version_slug}"
|
||||
)
|
||||
|
||||
current_version = Version.parse_version_slug(current_version_slug)
|
||||
target_version = Version.parse_version_slug(target_version_slug)
|
||||
|
||||
if target_version > current_version:
|
||||
print("target version is newer\n")
|
||||
exit(0)
|
||||
|
||||
print("current version is newer\n")
|
||||
exit(1)
|
||||
@@ -34,19 +34,6 @@ yq e -i ".appVersion = \"${RELEASE_VERSION}\"" "${GIT_ROOT}/utils/helm/speckle-s
|
||||
yq e -i ".docker_image_tag = \"${RELEASE_VERSION}\"" "${GIT_ROOT}/utils/helm/speckle-server/values.yaml"
|
||||
|
||||
if [[ "${GITHUB_REF}" == refs/tags/* || "${GITHUB_REF_NAME}" == "${HELM_STABLE_BRANCH}" ]]; then
|
||||
echo "⚠️ prod release ${RELEASE_VERSION}"
|
||||
# before overwriting the chart with the build version, check if the current chart version
|
||||
# is not newer than the currently build one
|
||||
|
||||
CURRENT_VERSION="$(grep ^version "${GIT_HELM}/charts/speckle-server/Chart.yaml" | grep -o '2\..*')"
|
||||
echo "ℹ️ Current version ${CURRENT_VERSION}"
|
||||
|
||||
"${GIT_ROOT}/.github/workflows/scripts/check_version.py" "${CURRENT_VERSION}" "${RELEASE_VERSION}"
|
||||
if [ $? -eq 1 ]
|
||||
then
|
||||
echo "The current helm chart version '${CURRENT_VERSION}' is newer than the version '${RELEASE_VERSION}' we are attempting to publish. Exiting"
|
||||
exit 1
|
||||
fi
|
||||
rm -rf "${GIT_HELM}/charts/speckle-server"
|
||||
cp -r "${GIT_ROOT}/utils/helm/speckle-server" "${GIT_HELM}/charts/speckle-server"
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user