From 6a37adbac109a6f9d0ddc381fa655497c2d89b8b Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Thu, 16 Jan 2025 18:44:03 -0500 Subject: [PATCH] Update to .NET SDK 9.0.102 and Runtime 9.0.1 Resolves: RHEL-71550 --- .gitignore | 2 ++ dotnet9.0.spec | 37 +++++++++++++++++++++++++++++++------ release.json | 12 ++++++------ sources | 4 ++-- 4 files changed, 41 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index dd09911..cf0b1b7 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ /dotnet-9.0.0.tar.gz.sig /dotnet-9.0.101.tar.gz /dotnet-9.0.101.tar.gz.sig +/dotnet-9.0.1.tar.gz +/dotnet-9.0.1.tar.gz.sig diff --git a/dotnet9.0.spec b/dotnet9.0.spec index 2ae6f7b..0874d0a 100644 --- a/dotnet9.0.spec +++ b/dotnet9.0.spec @@ -10,13 +10,13 @@ # upstream can produce releases with a different tag than the SDK version #%%global upstream_tag v%%{runtime_version} -%global upstream_tag v9.0.101 +%global upstream_tag v9.0.1 %global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||') %global hostfxr_version %{runtime_version} -%global runtime_version 9.0.0 -%global aspnetcore_runtime_version 9.0.0 -%global sdk_version 9.0.101 +%global runtime_version 9.0.1 +%global aspnetcore_runtime_version 9.0.1 +%global sdk_version 9.0.102 %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|') %global templates_version %{aspnetcore_runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') @@ -70,7 +70,7 @@ Name: dotnet%{dotnetver} Version: %{sdk_rpm_version} -Release: 3%{?dist} +Release: 2%{?dist} Summary: .NET Runtime and SDK License: 0BSD AND Apache-2.0 AND (Apache-2.0 WITH LLVM-exception) AND APSL-2.0 AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND BSL-1.0 AND bzip2-1.0.6 AND CC0-1.0 AND CC-BY-3.0 AND CC-BY-4.0 AND CC-PDDC AND CNRI-Python AND EPL-1.0 AND GPL-2.0-only AND (GPL-2.0-only WITH GCC-exception-2.0) AND GPL-2.0-or-later AND GPL-3.0-only AND ICU AND ISC AND LGPL-2.1-only AND LGPL-2.1-or-later AND LicenseRef-Fedora-Public-Domain AND LicenseRef-ISO-8879 AND MIT AND MIT-Wu AND MS-PL AND MS-RL AND NCSA AND OFL-1.1 AND OpenSSL AND Unicode-DFS-2015 AND Unicode-DFS-2016 AND W3C-19980720 AND X11 AND Zlib @@ -642,7 +642,28 @@ system_libs= system_libs=$system_libs+zlib+ %endif -VERBOSE=1 timeout 5h \ +%ifarch ppc64le s390x +max_attempts=3 +%else +max_attempts=1 +%endif + +function retry_until_success { + local exit_code=1 + local tries=$1 + shift + set +e + while [[ $exit_code != 0 ]] && [[ $tries != 0 ]]; do + (( tries = tries - 1 )) + "$@" + exit_code=$? + done + set -e + return $exit_code +} + +VERBOSE=1 retry_until_success $max_attempts \ + timeout 5h \ ./build.sh \ --source-only \ --release-manifest %{SOURCE5} \ @@ -842,6 +863,10 @@ export COMPlus_LTTng=0 %changelog +* Thu Jan 16 2025 Omair Majid - 9.0.102-2 +- Update to .NET SDK 9.0.102 and Runtime 9.0.1 +- Resolves: RHEL-71550 + * Thu Dec 05 2024 Omair Majid - 9.0.101-3 - Update to .NET SDK 9.0.101 and Runtime 9.0.0 - Resolves: RHEL-69749 diff --git a/release.json b/release.json index 09dbce3..9a11ff0 100644 --- a/release.json +++ b/release.json @@ -1,10 +1,10 @@ { - "release": "9.0.0", + "release": "9.0.1", "channel": "9.0", - "tag": "v9.0.101", - "sdkVersion": "9.0.101", - "runtimeVersion": "9.0.0", - "aspNetCoreVersion": "9.0.0", + "tag": "v9.0.1", + "sdkVersion": "9.0.102", + "runtimeVersion": "9.0.1", + "aspNetCoreVersion": "9.0.1", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "f303476b533b0f90901c0a5e07a3bd2fb68777e3" + "sourceVersion": "1cf154a56d078c531cc830e95a7cfdbc4fe1113c" } diff --git a/sources b/sources index 5298995..97663a6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dotnet-9.0.101.tar.gz) = a422297fa72bb1ef78e42f597eb88a1a437b57a6fe792f4c9aa48bd826f861c650995462504e86be454a9b3a2a7404ed4754264a449b3a2166e46e207205b52d -SHA512 (dotnet-9.0.101.tar.gz.sig) = cdf10b7d39ce169d6b59a3d0a4999c994c06909b5d906319275a12dd984fb3cdbb768389c7f4e4d6de32629eb34809d828bea874e8b972cb29ac2583b705cf18 +SHA512 (dotnet-9.0.1.tar.gz) = 90a613b8efc85b8c5d852c239e507acb3cf00ed50303db98e7567924ba21271a4d6aa0bb63e6da3703beb97f8f64d6ca36fda000bc9ff537b034ea43455f19be +SHA512 (dotnet-9.0.1.tar.gz.sig) = 3b26d79ad2f899c8952695e60ce0d9da7f6b9c0bf274caa4bc668fe24195349fe6faa5a06cd2fd260bf68511d6aa90383454e910a635d034473c2fd216cb2158