Skip to content

Commit 389af4a

Browse files
jslobodzianjslobodzian
committed
Revert "golang: bump Go version to 1.24.0-1 (#12409)"
This reverts commit 7cdbd37.
1 parent 7cdbd37 commit 389af4a

7 files changed

Lines changed: 23 additions & 33 deletions

File tree

‎LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LICENSES-AND-NOTICES/SPECS/data/licenses.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2763,7 +2763,7 @@
27632763
"gnutls",
27642764
"gobject-introspection",
27652765
"golang",
2766-
"golang-1.23",
2766+
"golang-1.22",
27672767
"gperf",
27682768
"gperftools",
27692769
"gpgme",

SPECS/golang/golang-1.23.signatures.json renamed to SPECS/golang/golang-1.22.signatures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"Signatures": {
33
"go.20230802.5.src.tar.gz": "56b9e0e0c3c13ca95d5efa6de4e7d49a9d190eca77919beff99d33cd3fa74e95",
44
"go.20240206.2.src.tar.gz": "7982e0011aa9ab95fd0530404060410af4ba57326d26818690f334fdcb6451cd",
5-
"go1.23.3-20241202.3.src.tar.gz": "7ac83f3918439205861a8ca9e10360e7a0867d9ba8327f283b411e1de077d0e2",
5+
"go1.22.10-20241203.4.src.tar.gz": "3a6318a0ff28798a1b1797b8d22c4f9604cae2088000c39a6875b2598ec4ab22",
66
"go1.4-bootstrap-20171003.tar.gz": "f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52"
77
}
88
}

SPECS/golang/golang-1.23.spec renamed to SPECS/golang/golang-1.22.spec

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%global goroot %{_libdir}/golang
22
%global gopath %{_datadir}/gocode
3-
%global ms_go_filename go1.23.3-20241202.3.src.tar.gz
4-
%global ms_go_revision 2
3+
%global ms_go_filename go1.22.10-20241203.4.src.tar.gz
4+
%global ms_go_revision 1
55
%ifarch aarch64
66
%global gohostarch arm64
77
%else
@@ -14,8 +14,8 @@
1414
%define __find_requires %{nil}
1515
Summary: Go
1616
Name: golang
17-
Version: 1.23.3
18-
Release: 3%{?dist}
17+
Version: 1.22.10
18+
Release: 2%{?dist}
1919
License: BSD-3-Clause
2020
Vendor: Microsoft Corporation
2121
Distribution: Azure Linux
@@ -154,19 +154,19 @@ fi
154154
%{_bindir}/*
155155

156156
%changelog
157-
* Tue Feb 04 2025 Tobias Brick <tobiasb@microsoft.com> - 1.23.3-3
157+
* Tue Feb 04 2025 Tobias Brick <tobiasb@microsoft.com> - 1.22.10-2
158158
- Fix post scriptlet
159159
- Remove calls to alternatives
160160
- Don't manually delete go-exports.sh
161161

162-
* Tue Dec 03 2024 Microsoft Golang Bot <microsoft-golang-bot@users.noreply.github.com> - 1.23.3-2
163-
- Bump version to 1.23.3-2
162+
* Wed Dec 04 2024 Microsoft Golang Bot <microsoft-golang-bot@users.noreply.github.com> - 1.22.10-1
163+
- Bump version to 1.22.10-1
164164

165-
* Fri Nov 08 2024 Microsoft Golang Bot <microsoft-golang-bot@users.noreply.github.com> - 1.23.3-1
166-
- Bump version to 1.23.3-1
165+
* Tue Dec 03 2024 Microsoft Golang Bot <microsoft-golang-bot@users.noreply.github.com> - 1.22.9-1
166+
- Bump version to 1.22.9-2
167167

168-
* Tue Oct 08 2024 Muhammad Falak <mwani@microsoft.com> - 1.23.1-1
169-
- Upgrade to 1.23.1
168+
* Tue Oct 08 2024 Muhammad Falak <mwani@microsoft.com> - 1.22.7-3
169+
- Fork out 1.22 as supported version
170170

171171
* Thu Sep 26 2024 Microsoft Golang Bot <microsoft-golang-bot@users.noreply.github.com> - 1.22.7-2
172172
- Bump version to 1.22.7-3

‎SPECS/golang/golang.signatures.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"Signatures": {
33
"go.20230802.5.src.tar.gz": "56b9e0e0c3c13ca95d5efa6de4e7d49a9d190eca77919beff99d33cd3fa74e95",
44
"go.20240206.2.src.tar.gz": "7982e0011aa9ab95fd0530404060410af4ba57326d26818690f334fdcb6451cd",
5-
"go1.22.12-20250211.4.src.tar.gz": "e1cc3bff8fdf1f24843ffc9f0eaddfd344eb40fd9ca0d9ba2965165be519eeb7",
6-
"go1.24.0-20250212.5.src.tar.gz": "18e65a4d37fad7b2a0795f67e9d69b32dd9ae57a345f3d0969072735cba1dc3f",
5+
"go1.23.3-20241202.3.src.tar.gz": "7ac83f3918439205861a8ca9e10360e7a0867d9ba8327f283b411e1de077d0e2",
76
"go1.4-bootstrap-20171003.tar.gz": "f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52"
87
}
98
}

‎SPECS/golang/golang.spec‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%global goroot %{_libdir}/golang
22
%global gopath %{_datadir}/gocode
3-
%global ms_go_filename go1.24.0-20250212.5.src.tar.gz
4-
%global ms_go_revision 1
3+
%global ms_go_filename go1.23.3-20241202.3.src.tar.gz
4+
%global ms_go_revision 2
55
%ifarch aarch64
66
%global gohostarch arm64
77
%else
@@ -14,8 +14,8 @@
1414
%define __find_requires %{nil}
1515
Summary: Go
1616
Name: golang
17-
Version: 1.24.0
18-
Release: 1%{?dist}
17+
Version: 1.23.3
18+
Release: 3%{?dist}
1919
License: BSD-3-Clause
2020
Vendor: Microsoft Corporation
2121
Distribution: Azure Linux
@@ -30,8 +30,6 @@ Patch0: go14_bootstrap_aarch64.patch
3030
Source2: https://github.com/microsoft/go/releases/download/v1.19.12-1/go.20230802.5.src.tar.gz
3131
# bootstrap 02
3232
Source3: https://github.com/microsoft/go/releases/download/v1.20.14-1/go.20240206.2.src.tar.gz
33-
# bootstrap 03
34-
Source4: https://github.com/microsoft/go/releases/download/v1.22.12-2/go1.22.12-20250211.4.src.tar.gz
3533

3634
Provides: %{name} = %{version}
3735
Provides: go = %{version}-%{release}
@@ -53,9 +51,6 @@ mv -v go go-bootstrap-01
5351
tar xf %{SOURCE3} --no-same-owner
5452
mv -v go go-bootstrap-02
5553

56-
tar xf %{SOURCE4} --no-same-owner
57-
mv -v go go-bootstrap-03
58-
5954
%setup -q -n go
6055

6156
%build
@@ -89,7 +84,6 @@ function go_bootstrap() {
8984
go_bootstrap 00
9085
go_bootstrap 01
9186
go_bootstrap 02
92-
go_bootstrap 03
9387

9488
# Build current go version
9589
export GOHOSTOS=linux
@@ -160,9 +154,6 @@ fi
160154
%{_bindir}/*
161155

162156
%changelog
163-
* Fri Feb 14 2025 Microsoft Golang Bot <microsoft-golang-bot@users.noreply.github.com> - 1.24.0-1
164-
- Bump version to 1.24.0-1
165-
166157
* Tue Feb 04 2025 Tobias Brick <tobiasb@microsoft.com> - 1.23.3-3
167158
- Fix post scriptlet
168159
- Remove calls to alternatives

‎cgmanifest.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4630,8 +4630,8 @@
46304630
"type": "other",
46314631
"other": {
46324632
"name": "golang",
4633-
"version": "1.23.3",
4634-
"downloadUrl": "https://github.com/microsoft/go/releases/download/v1.23.3-2/go1.23.3-20241202.3.src.tar.gz"
4633+
"version": "1.22.10",
4634+
"downloadUrl": "https://github.com/microsoft/go/releases/download/v1.22.10-1/go1.22.10-20241203.4.src.tar.gz"
46354635
}
46364636
}
46374637
},
@@ -4640,8 +4640,8 @@
46404640
"type": "other",
46414641
"other": {
46424642
"name": "golang",
4643-
"version": "1.24.0",
4644-
"downloadUrl": "https://github.com/microsoft/go/releases/download/v1.24.0-1/go1.24.0-20250212.5.src.tar.gz"
4643+
"version": "1.23.3",
4644+
"downloadUrl": "https://github.com/microsoft/go/releases/download/v1.23.3-2/go1.23.3-20241202.3.src.tar.gz"
46454645
}
46464646
}
46474647
},

0 commit comments

Comments
 (0)