Skip to content

Commit 0de902e

Browse files
jslobodzianjslobodzian
authored
Upgrade golang to 1.24.1. (#12873)
2 parents 6392f5a + 82729b7 commit 0de902e

File tree

9 files changed

+49
-27
lines changed

9 files changed

+49
-27
lines changed

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

Lines changed: 2 additions & 2 deletions
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.22",
2766+
"golang-1.23",
27672767
"gperf",
27682768
"gperftools",
27692769
"gpgme",

‎SPECS/golang/golang-1.22.signatures.json renamed to ‎SPECS/golang/golang-1.23.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.22.10-20241203.4.src.tar.gz": "3a6318a0ff28798a1b1797b8d22c4f9604cae2088000c39a6875b2598ec4ab22",
5+
"go1.23.7-20250304.2.src.tar.gz": "dd88200b3af90f6125ceb4055f8fdf2ef78344ed96195231b692942c7ae1413e",
66
"go1.4-bootstrap-20171003.tar.gz": "f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52"
77
}
88
}

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

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

156156
%changelog
157-
* Tue Feb 04 2025 Tobias Brick <[email protected]> - 1.22.10-2
157+
* Wed Mar 05 2025 Microsoft Golang Bot <[email protected]> - 1.23.7-1
158+
- Bump version to 1.23.7-1
159+
160+
* Tue Feb 04 2025 Tobias Brick <[email protected]> - 1.23.3-3
158161
- Fix post scriptlet
159162
- Remove calls to alternatives
160163
- Don't manually delete go-exports.sh
161164

162-
* Wed Dec 04 2024 Microsoft Golang Bot <[email protected]> - 1.22.10-1
163-
- Bump version to 1.22.10-1
165+
* Tue Dec 03 2024 Microsoft Golang Bot <[email protected]> - 1.23.3-2
166+
- Bump version to 1.23.3-2
164167

165-
* Tue Dec 03 2024 Microsoft Golang Bot <[email protected]> - 1.22.9-1
166-
- Bump version to 1.22.9-2
168+
* Fri Nov 08 2024 Microsoft Golang Bot <[email protected]> - 1.23.3-1
169+
- Bump version to 1.23.3-1
167170

168-
* Tue Oct 08 2024 Muhammad Falak <[email protected]> - 1.22.7-3
169-
- Fork out 1.22 as supported version
171+
* Tue Oct 08 2024 Muhammad Falak <[email protected]> - 1.23.1-1
172+
- Upgrade to 1.23.1
170173

171174
* Thu Sep 26 2024 Microsoft Golang Bot <[email protected]> - 1.22.7-2
172175
- Bump version to 1.22.7-3

‎SPECS/golang/golang.signatures.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
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.12-20250211.4.src.tar.gz": "e1cc3bff8fdf1f24843ffc9f0eaddfd344eb40fd9ca0d9ba2965165be519eeb7",
6+
"go1.24.1-20250304.4.src.tar.gz": "d3bba6c5f7ff729121d2104c250fe96e5a6d7c6cb555d4ea038cfe69524417f6",
67
"go1.4-bootstrap-20171003.tar.gz": "f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52"
78
}
89
}

‎SPECS/golang/golang.spec

Lines changed: 16 additions & 4 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.24.1-20250304.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.24.1
18+
Release: 1%{?dist}
1919
License: BSD-3-Clause
2020
Vendor: Microsoft Corporation
2121
Distribution: Azure Linux
@@ -30,6 +30,8 @@ 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
3335

3436
Provides: %{name} = %{version}
3537
Provides: go = %{version}-%{release}
@@ -51,6 +53,9 @@ mv -v go go-bootstrap-01
5153
tar xf %{SOURCE3} --no-same-owner
5254
mv -v go go-bootstrap-02
5355

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

5661
%build
@@ -84,6 +89,7 @@ function go_bootstrap() {
8489
go_bootstrap 00
8590
go_bootstrap 01
8691
go_bootstrap 02
92+
go_bootstrap 03
8793

8894
# Build current go version
8995
export GOHOSTOS=linux
@@ -154,6 +160,12 @@ fi
154160
%{_bindir}/*
155161

156162
%changelog
163+
* Wed Mar 05 2025 Microsoft Golang Bot <[email protected]> - 1.24.1-1
164+
- Bump version to 1.24.1-1
165+
166+
* Fri Feb 14 2025 Microsoft Golang Bot <[email protected]> - 1.24.0-1
167+
- Bump version to 1.24.0-1
168+
157169
* Tue Feb 04 2025 Tobias Brick <[email protected]> - 1.23.3-3
158170
- Fix post scriptlet
159171
- Remove calls to alternatives

‎SPECS/libnvidia-container/libnvidia-container.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Summary: NVIDIA container runtime library
55
Name: libnvidia-container
66
Version: 1.17.4
7-
Release: 1%{?dist}
7+
Release: 2%{?dist}
88
License: BSD AND ASL2.0 AND GPLv3+ AND LGPLv3+ AND MIT AND GPLv2
99
Vendor: Microsoft Corporation
1010
Distribution: Azure Linux
@@ -21,7 +21,7 @@ BuildRequires: libtirpc-devel
2121
BuildRequires: make
2222
BuildRequires: rpcsvc-proto
2323
BuildRequires: which
24-
BuildRequires: golang
24+
BuildRequires: golang < 1.24.0
2525

2626
%description
2727
The nvidia-container library provides an interface to configure GNU/Linux
@@ -135,6 +135,9 @@ This package contains command-line tools that facilitate using the library.
135135
%{_bindir}/*
136136

137137
%changelog
138+
* Mon Mar 10 2025 Jon Slobodzian <[email protected]> - 1.17.4-2
139+
- The Golang 1.24 breaks this build. Changed BuildRequires to specify a lower version.
140+
138141
* Fri Feb 14 2025 Mitch Zhu <[email protected]> - 1.17.4-1
139142
- Upgrade to version 1.17.4 to stay in sync with nvidia-container-toolkit.
140143

‎SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Summary: NVIDIA container runtime hook
33
Name: nvidia-container-toolkit
44
Version: 1.17.4
5-
Release: 1%{?dist}
5+
Release: 2%{?dist}
66
License: ALS2.0
77
Vendor: Microsoft Corporation
88
Distribution: Azure Linux
@@ -28,7 +28,7 @@ Source0: %{name}-%{version}.tar.gz
2828
# See: https://reproducible-builds.org/docs/archives/
2929
# - For the value of "--mtime" use the date "2021-04-26 00:00Z" to simplify future updates.
3030
Source1: %{name}-%{version}-vendor.tar.gz
31-
BuildRequires: golang >= 1.20.7
31+
BuildRequires: golang < 1.24.0
3232
Obsoletes: nvidia-container-runtime <= 3.5.0-1, nvidia-container-runtime-hook <= 1.4.0-2
3333
Provides: nvidia-container-runtime
3434
Provides: nvidia-container-runtime-hook
@@ -88,6 +88,9 @@ rm -f %{_bindir}/nvidia-container-toolkit
8888
%{_bindir}/nvidia-cdi-hook
8989

9090
%changelog
91+
* Fri Mar 07 2025 Jon Slobodzian <[email protected]> - 1.17.4-2
92+
- Changing nvidia-container-toolkit to use latest golang before 1.24 as this will not compile without it.
93+
9194
* Thu Feb 13 2025 Mitch Zhu <[email protected]> - 1.17.4-1
9295
- Upgrade to v1.17.4 to resolve CVE-2025-23359
9396

‎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.22.10",
4634-
"downloadUrl": "https://github.com/microsoft/go/releases/download/v1.22.10-1/go1.22.10-20241203.4.src.tar.gz"
4633+
"version": "1.23.7",
4634+
"downloadUrl": "https://github.com/microsoft/go/releases/download/v1.23.7-1/go1.23.7-20250304.2.src.tar.gz"
46354635
}
46364636
}
46374637
},
@@ -4640,8 +4640,8 @@
46404640
"type": "other",
46414641
"other": {
46424642
"name": "golang",
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"
4643+
"version": "1.24.1",
4644+
"downloadUrl": "https://github.com/microsoft/go/releases/download/v1.24.1-1/go1.24.1-20250304.4.src.tar.gz"
46454645
}
46464646
}
46474647
},

0 commit comments

Comments
 (0)