Skip to content

Commit

Permalink
Merge pull request #1568 from SUSE/remove-golang-unstable
Browse files Browse the repository at this point in the history
Drop the golang unstable variant
  • Loading branch information
dcermak authored Aug 20, 2024
2 parents fa8d3d1 + f9836bd commit cd6721e
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions src/bci_build/package/golang.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
_GO_VER_T = Literal["1.20", "1.21", "1.22", "1.23"]
_GOLANG_VERSIONS: list[_GO_VER_T] = ["1.22", "1.23"]
_GOLANG_OPENSSL_VERSIONS: list[_GO_VER_T] = ["1.20", "1.21"]
_GOLANG_TW_VERSIONS: list[_GO_VER_T] = _GOLANG_VERSIONS
_GOLANG_VARIANT_T = Literal["", "-openssl"]

assert len(_GOLANG_VERSIONS) == 2, "Only two golang versions must be supported"
Expand All @@ -33,11 +32,6 @@ def _get_golang_kwargs(
is_stable = ver == _GOLANG_OPENSSL_VERSIONS[-1]

stability_tag = f"oldstable{variant}"
if (
_GOLANG_TW_VERSIONS[-1] != _GOLANG_VERSIONS[-1]
and ver == _GOLANG_TW_VERSIONS[-1]
):
stability_tag = f"unstable{variant}"
if is_stable:
stability_tag = f"stable{variant}"

Expand Down Expand Up @@ -108,6 +102,6 @@ def _get_golang_kwargs(
]
+ [
DevelopmentContainer(**_get_golang_kwargs(ver, "", OsVersion.TUMBLEWEED))
for ver in set(_GOLANG_VERSIONS + _GOLANG_TW_VERSIONS)
for ver in _GOLANG_VERSIONS
]
)

0 comments on commit cd6721e

Please sign in to comment.