PR#18: Update to 1.18beta1 - rpms/golang

rpms / golang

#18 Update to 1.18beta1

Merged 2 years ago by alexsaezm. Opened 2 years ago by mroche.

Unknown source rawhide into rawhide

Update to 1.18beta1

Mike Rochefort • 2 years ago

4db6ed1

0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch

file modified

+1 -1

		`@@ -29,7 +29,7 @@`
		`- z, err := loadLocation("America/Los_Angeles", zoneSources[len(zoneSources)-1:])`
		`+ z, err := loadLocation("America/Los_Angeles", zoneSources)`
		`if err != nil {`
		`- panic("cannot load America/Los_Angeles for testing: " + err.Error())`
		`+ panic("cannot load America/Los_Angeles for testing: " + err.Error() + "; you may want to use -tags=timetzdata")`
		`}`
		`@@ -21,8 +23,9 @@ func initTestingZone() {`
		`var OrigZoneSources = zoneSources`

golang.spec

file modified

+17 -12

		`@@ -105,8 +105,8 @@`
		`%global gohostarch s390x`
		`%endif`

		`- %global go_api 1.17`
		`- %global go_version %{go_api}.5`
		`+ %global go_api 1.18`
		`+ %global go_version %{go_api}beta1`

		`# For rpmdev-bumpspec and releng automation`
		`%global baserelease 1`
		`@@ -140,16 +140,17 @@`

		`# Bundled/Vendored provides generated by bundled-deps.sh based on the in tree module data`
		`# - in version filed substituted with . per versioning guidelines`
		`- Provides: bundled(golang(github.com/google/pprof)) = 0.0.0.20210506205249.923b5ab0fc1a`
		`- Provides: bundled(golang(github.com/ianlancetaylor/demangle)) = 0.0.0.20200824232613.28f6c0f3b639`
		`- Provides: bundled(golang(golang.org/x/arch)) = 0.0.0.20210502124803.cbf565b21d1e`
		`- Provides: bundled(golang(golang.org/x/crypto)) = 0.0.0.20210503195802.e9a32991a82e`
		`- Provides: bundled(golang(golang.org/x/mod)) = 0.5.1`
		`- Provides: bundled(golang(golang.org/x/net)) = 0.0.0.20211209100829.84cba5454caf`
		`- Provides: bundled(golang(golang.org/x/sys)) = 0.0.0.20210511113859.b0526f3d8744`
		`- Provides: bundled(golang(golang.org/x/term)) = 0.0.0.20210503060354.a79de5458b56`
		`- Provides: bundled(golang(golang.org/x/text)) = 0.3.7.0.20210503195748.5c7c50ebbd4f`
		`- Provides: bundled(golang(golang.org/x/tools)) = 0.1.2.0.20210519160823.49064d2332f9`
		`+ Provides: bundled(golang(github.com/google/pprof)) = 0.0.0.20211104044539.f987b9c94b31`
		`+ Provides: bundled(golang(github.com/ianlancetaylor/demangle)) = 0.0.0.20210905161508.09a460cdf81d`
		`+ Provides: bundled(golang(golang.org/x/arch)) = 0.0.0.20210923205945.b76863e36670`
		`+ Provides: bundled(golang(golang.org/x/crypto)) = 0.0.0.20211108221036.ceb1ce70b4fa`
		`+ Provides: bundled(golang(golang.org/x/mod)) = 0.6.0.dev.0.20211102181907.3a5865c02020`
		`+ Provides: bundled(golang(golang.org/x/net)) = 0.0.0.20211209124913.491a49abca63`
		`+ Provides: bundled(golang(golang.org/x/sync)) = 0.0.0.20210220032951.036812b2e83c`
		`+ Provides: bundled(golang(golang.org/x/sys)) = 0.0.0.20211205182925.97ca703d548d`
		`+ Provides: bundled(golang(golang.org/x/term)) = 0.0.0.20210927222741.03fcf44c2211`
		`+ Provides: bundled(golang(golang.org/x/text)) = 0.3.8.0.20211105212822.18b340fc7af2`
		`+ Provides: bundled(golang(golang.org/x/tools)) = 0.1.9.0.20211207220608.fd2bfb79a16a`
		`Provides: bundled(golang(golang.org/x/xerrors)) = 0.0.0.20200804184101.5ec99f83aff1`

		`Requires: %{name}-bin = %{version}-%{release}`
		`@@ -535,6 +536,10 @@`
		`%endif`

		`%changelog`
		`+ * Tue Dec 14 2021 Mike Rochefort <mroche@redhat.com> - 1.18beta1-1`
		`+ - Update to 1.18beta1`
		`+ - Related: rhbz#2002859`
		`+`
		`* Tue Dec 14 2021 Alejandro Sáez <asm@redhat.com> - 1.17.5-1`
		`- Update to 1.17.5`
		`- Update bundles`

mroche commented 2 years ago

Related: rhbz#2002859

Unsure if some patches (such as the tzdata) are necessary or not, it seems like some of the build process may have changed since 1.16 moves to out of support: https://github.com/golang/go/commit/f229e7031a6efb2f23241b5da000c3b3203081d6

(also don't have permissions to upload the 1.18beta1 tarball, so CI will fail here)

mroche commented 2 years ago

x86 and aarch64 CI here: https://copr.fedorainfracloud.org/coprs/mroche/golang-test/build/3047645/

Metadata Update from @alexsaezm:
- Request assigned

2 years ago

Metadata Update from @alexsaezm:
- Request assigned

2 years ago

alexsaezm commented 2 years ago

LGTM so I'm going to run a scratch build.

(Still starting at the time of this comment)

https://koji.fedoraproject.org/koji/taskinfo?taskID=80018545

Pull-Request has been merged by alexsaezm

2 years ago

qulogic commented 2 years ago

You have versioned this incorrectly:

$ rpmdev-vercmp 1.18beta1 1.18
1.18beta1 > 1.18

So if you build 1.18 later (which has historically been the style of initial micro versions), it will not end up being newer. This might be fine for Rawhide where old builds are dropped from composes, but would cause trouble if the final release is not out early enough and 1.18beta1 ends up in the Beta.

To get this to work, you will have to bump the epoch to get it to be newer, or package 1.18 as 1.18.0:

$ rpmdev-vercmp 1.18beta1 1.18.0
1.18beta1 < 1.18.0

I see this has been done this way many times in the past, but may have only worked through fluke of the change only being in Rawhide. In the future, it would be better to use tilde versioning for pre-releases: https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_handling_non_sorting_versions_with_tilde_dot_and_caret

mroche commented 2 years ago

@qulogic Thanks for catching this! I was unfamiliar with those versioning rules, I appreciate the info. I spaced when making this and was thinking the base version was going to be 1.18.0, forgetting that this project doesn't use .0s (though that doesn't change what the correct method to use would have been).

What's the remediation path forward? Should a new commit where 1.18beta1 just simply looks like the following be added, and a potentially forced removal of the previous build (if that's even possible)? The F36 Beta freeze window lines up pretty closely to the Go 1.18 GA timeline (February), so if there's a way to correct this ahead of time that would be good.

%global go_api 1.18
%global go_version %{go_api}~beta1

I don't have commit access to this repo and I'm not part of the packager group, so I can open a new PR to do this if a current maintainer doesn't have the time. @alexsaezm