Handle PR review comments

microsoft · Jul 16, 2024 · 4659a71 · 4659a71
1 parent 96f9d6d
commit 4659a71
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 32 deletions.
diff --git a/SPECS/golang/golang.signatures.json b/SPECS/golang/golang.signatures.json
@@ -2,7 +2,7 @@
  "Signatures": {
   "go1.17.13.src.tar.gz": "a1a48b23afb206f95e7bbaa9b898d965f90826f6f1d1fc0c1d784ada0cd300fd",
   "go1.21.6.src.tar.gz": "124926a62e45f78daabbaedb9c011d97633186a33c238ffc1e25320c02046248",
-  "go1.22.4.src.tar.gz": "fed720678e728a7ca30ba8d1ded1caafe27d16028fab0232b8ba8e22008fb784",
+  "go1.22.5.src.tar.gz": "ac9c723f224969aee624bc34fd34c9e13f2a212d75c71c807de644bb46e112f6",
   "go1.4-bootstrap-20171003.tar.gz": "f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52"
  }
 }
diff --git a/SPECS/golang/golang.spec b/SPECS/golang/golang.spec
@@ -1,6 +1,6 @@
 %global bootstrap_compiler_version_0 1.17.13
 %global bootstrap_compiler_version_1 1.21.6
-%global bootstrap_compiler_version_2 1.22.4
+%global go_version_to_build 1.22.5
 %global goroot          %{_libdir}/golang
 %global gopath          %{_datadir}/gocode
 %ifarch aarch64
@@ -15,7 +15,7 @@
 %define __find_requires %{nil}
 Summary:        Go
 Name:           golang
-Version:        1.22.4
+Version:        1.22.5
 Release:        1%{?dist}
 License:        BSD-3-Clause
 Vendor:         Microsoft Corporation
@@ -26,7 +26,7 @@ Source0:        https://golang.org/dl/go%{version}.src.tar.gz
 Source1:        https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz
 Source2:        https://dl.google.com/go/go%{bootstrap_compiler_version_0}.src.tar.gz
 Source3:        https://dl.google.com/go/go%{bootstrap_compiler_version_1}.src.tar.gz
-Source4:        https://dl.google.com/go/go%{bootstrap_compiler_version_2}.src.tar.gz
+Source4:        https://dl.google.com/go/go%{go_version_to_build}.src.tar.gz
 Patch0:         go14_bootstrap_aarch64.patch
 Obsoletes:      %{name} < %{version}
 Provides:       %{name} = %{version}
@@ -85,19 +85,19 @@ rm -rf %{_libdir}/golang
 mv -v %{_topdir}/BUILD/go%{bootstrap_compiler_version_1} %{_libdir}/golang
 export GOROOT=%{_libdir}/golang
 
-# Use %{bootstrap_compiler_version_1} to compile %{bootstrap_compiler_version_2}
+# Use %{bootstrap_compiler_version_1} to compile %{go_version_to_build}
 export GOROOT_BOOTSTRAP=%{_libdir}/golang
-mkdir -p %{_topdir}/BUILD/go%{bootstrap_compiler_version_2}
-tar xf %{SOURCE4} -C %{_topdir}/BUILD/go%{bootstrap_compiler_version_2} --strip-components=1
-pushd %{_topdir}/BUILD/go%{bootstrap_compiler_version_2}/src
+mkdir -p %{_topdir}/BUILD/go%{go_version_to_build}
+tar xf %{SOURCE4} -C %{_topdir}/BUILD/go%{go_version_to_build} --strip-components=1
+pushd %{_topdir}/BUILD/go%{go_version_to_build}/src
 CGO_ENABLED=0 ./make.bash
 popd
 
 # Nuke the older %{bootstrap_compiler_version_1}
 rm -rf %{_libdir}/golang
 
-# Make go%{bootstrap_compiler_version_2} as the new bootstrapper
-mv -v %{_topdir}/BUILD/go1.22.4 %{_libdir}/golang
+# Make go%{go_version_to_build} as the new bootstrapper
+mv -v %{_topdir}/BUILD/go%{go_version_to_build} %{_libdir}/golang
 
 # Build current go version
 export GOHOSTOS=linux

diff --git a/cgmanifest.json b/cgmanifest.json
@@ -4630,28 +4630,8 @@
         "type": "other",
         "other": {
           "name": "golang",
-          "version": "1.19.12",
-          "downloadUrl": "https://golang.org/dl/go1.19.12.src.tar.gz"
-        }
-      }
-    },
-    {
-      "component": {
-        "type": "other",
-        "other": {
-          "name": "golang",
-          "version": "1.21.11",
-          "downloadUrl": "https://golang.org/dl/go1.21.11.src.tar.gz"
-        }
-      }
-    },
-    {
-      "component": {
-        "type": "other",
-        "other": {
-          "name": "golang",
-          "version": "1.22.4",
-          "downloadUrl": "https://golang.org/dl/go1.22.4.src.tar.gz"
+          "version": "1.22.5",
+          "downloadUrl": "https://golang.org/dl/go1.22.5.src.tar.gz"
         }
       }
     },