From 57a05b040b648ee58c2cca404dfa82c02e624800 Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Mon, 20 Jul 2026 00:32:57 -0400 Subject: [PATCH] import UBI dotnet9.0-9.0.119-1.el10_2 --- .gitignore | 2 +- dotnet-9.0.118.tar.gz.sig | 17 --------- dotnet-9.0.119.tar.gz.sig | 17 +++++++++ dotnet9.0.spec | 80 ++++++++++++++++++++++++++++++++++++--- release.json | 12 +++--- sources | 2 +- 6 files changed, 100 insertions(+), 30 deletions(-) delete mode 100644 dotnet-9.0.118.tar.gz.sig create mode 100644 dotnet-9.0.119.tar.gz.sig diff --git a/.gitignore b/.gitignore index 6d4bece..45845d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -dotnet-9.0.118.tar.gz +dotnet-9.0.119.tar.gz diff --git a/dotnet-9.0.118.tar.gz.sig b/dotnet-9.0.118.tar.gz.sig deleted file mode 100644 index f455521..0000000 --- a/dotnet-9.0.118.tar.gz.sig +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: BSN Pgp v1.0.0.0 - -iQIcBAABCAAGBQJqF4ZBAAoJEP2/U8JNtIcuvSoQALRDTKe9u3iYjBTQFHtZlloq -OOoNHSpQbfJfDvO1DqUSeYpr75ZkxRDbJM+sGb+XtszW7V/JdgKXkolhhjJauJ+U -OD6LQL9kuRrqfomAnp0A3wo+MXB1k4KUxk2rid8mN5NjhqS22jN0QV8pr43t4/VI -mGjF/5+b3jfPAm3At76YYgctSo8aBcsGPOlNaC8ATN4rglMUhCfPrwFIxmZ5EF1U -ZJOklf0L4SmHFWWnsHAstCS4qkeR2MF6fqU44MnOgxP0l3o3zrGytuK+Jlzym2NQ -+t2Mg0kNdGVgLSPMycGEgftb7c8ItPh2glcHh9ssUhYn40h02KuQWgblDMGZiXuN -Fa2yluxxr8EjzEDeUUnxEwJHEeoXprk2SJtAUsRoPABEojrwq76QHP0/2pTLGLJ0 -tlTfp7WoER05+s+JqNUOJVweS4HvW1cLs7zeAdDMfUPgQGF8Z6d/D5A7frq3yUOQ -G/d8jfpMLe5h/nc4LNFTPsFQpSKWuQatjQl7gbjV6JVkEteQWXvLmTthTCdw2K9h -Y1rReLNLsh1KEI5G+tN8kvX6qx6oy7dNqyTF0tDhIfIhlWqIZwEuzu/b2C6doEeI -3iMRjYwQUUPyUkvecqaTlQ0NT2TDAhhrX9WkoLUqnSqsJhvx1jGIheYN9BY3GBFc -3eWahKxo2tAVQOsO5lvZ -=3gLg ------END PGP SIGNATURE----- diff --git a/dotnet-9.0.119.tar.gz.sig b/dotnet-9.0.119.tar.gz.sig new file mode 100644 index 0000000..7449e3b --- /dev/null +++ b/dotnet-9.0.119.tar.gz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: BSN Pgp v1.0.0.0 + +iQIcBAABCAAGBQJqRTDYAAoJEP2/U8JNtIcu3oQQANIjxpAwRmp4pSSP5e/yawxh +cpwdU6X/Lgy62Cn0+bfY1HhV2oiKkg+46ST+6742E7W1ioktcrYG88d8vkzDm9W9 +g/Z0JKcuqLFfDGQO7+QgIQAx64hTEeebw3wDGR+JjoR9BZlPAzilArZLXuBTqF5d ++/NWUy2TuFnUy/MVWiqByQo1gETtCtM3c2BEp61fU0R1LhS0t00JNsfQ4jOtqBfv +GnRLyz0npOeluvS0i/HrcmEixiXxhxVT+XkKkqWzcaTb9IYNYy91s87/GMnZbfNx +Sb3L2a5OfM0/2jsQ+rbdNnMr/dBCv/D0l9rve9ZwYI9zVdjhwW2HMXFmaYc+Tp1K +CICpureajPqCnrnH+ykPpiCRhQJMdLkPv/IudcHLc1AAoJCxRfV9s38G4FKtsIZc +kpcpNUyO8cym7rXbTDm6lJvwfy09Tf7/GYKFDyeki1YPYma46fzGVPH+W9SOrd2e +XXGDW3iHulrWJt0vOGGuxRMxkObrEy4gmIXvS6jwO5VcvZrvMSXvs1oLpObmEKXh +myt71egvHiiQ3tgRPmSf0s4Q5Za1V0WSLCaxUuShzm+YIRcG69qXkL/8dA002IJY +amgpFWweV4prwLl/4EIy+4thjQMylJkruYfam1g4pKiGndzuMqZAhAoDYFhnUDFJ +ti5TzAbAzZ/JvCmBAzXP +=mxJL +-----END PGP SIGNATURE----- diff --git a/dotnet9.0.spec b/dotnet9.0.spec index aa5763a..3c3f4bd 100644 --- a/dotnet9.0.spec +++ b/dotnet9.0.spec @@ -14,13 +14,13 @@ # upstream can produce releases with a different tag than the SDK version #%%global upstream_tag v%%{runtime_version} -%global upstream_tag v9.0.118 +%global upstream_tag v9.0.119 %global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||') %global hostfxr_version %{runtime_version} -%global runtime_version 9.0.17 -%global aspnetcore_runtime_version 9.0.17 -%global sdk_version 9.0.118 +%global runtime_version 9.0.18 +%global aspnetcore_runtime_version 9.0.18 +%global sdk_version 9.0.119 %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 }') @@ -669,6 +669,8 @@ function retry_until_success { set +e while [[ $exit_code != 0 ]] && [[ $tries != 0 ]]; do (( tries = tries - 1 )) + # Clean stale build state so retries start fresh. + rm -rf .packages $(find . -name artifacts -type d) "$@" exit_code=$? done @@ -676,6 +678,66 @@ function retry_until_success { return $exit_code } +# Runs a command and kills it if it produces no output. +# Use a longer timeout on machines with fewer cores since builds are slower. +function output_timeout { + # 30m on machines with more than 4 cores, 60m on smaller machines where builds are slower. + # The aarch64 Neoverse N1 CI machines have 4 cores and need the longer timeout. + local nprocs=$(nproc) + local idle_timeout=1800 + if (( nprocs <= 4 )); then + idle_timeout=3600 + fi + + # Create a pipe we'll read the output from for timeout detection. + local fifo=$(mktemp -u) + mkfifo "$fifo" + + # Create a process group so we can kill every process including children. + # And use a long timeout (5h) in (the unlikely) case output timeout detection continues to be triggered. + setsid timeout --foreground 5h "$@" &> "$fifo" & + local cmd_pid=$! + + # Read lines from the output with a timeout. + # Disable tracing to avoid 'set -x' noise from the read loop appearing in the output. + local timed_out=false + local traceflags=$- + set +x + while true; do + local rc=0 + IFS= read -t $idle_timeout -r line || rc=$? + if (( rc == 0 )); then + printf '%s\n' "$line" + elif (( rc > 128 )); then + echo "output_timeout: no output for ${idle_timeout}s" >&2 + timed_out=true + break + else + [[ -z $line ]] || printf '%s\n' "$line" + break + fi + done < "$fifo" + [[ $traceflags != *x* ]] || set -x + + if $timed_out; then + # Hang detected: kill the process group, then collect the exit code. + kill -9 -- -$cmd_pid 2>/dev/null || true + wait $cmd_pid 2>/dev/null + local exit_code=$? + else + # Normal exit: collect the real exit code, then clean up any orphaned processes. + wait $cmd_pid 2>/dev/null + local exit_code=$? + kill -9 -- -$cmd_pid 2>/dev/null || true + fi + + # Cleanup. + rm -f "$fifo" + + return $exit_code +} + + cat >dotnet-rpm-build.sh < - 9.0.119-1 +- Update to .NET SDK 9.0.119 and Runtime 9.0.18 +- Resolves: RHEL-192473 + +* Thu Jul 02 2026 Tom Deseyn - 9.0.118-2 +- Reduce time to detect hanging builds +- Resolves: RHEL-191644 + * Wed Jun 03 2026 Tom Deseyn - 9.0.118-1 - Update to .NET SDK 9.0.118 and Runtime 9.0.17 - Resolves: RHEL-181554 diff --git a/release.json b/release.json index 9d90ea8..5f4cae0 100644 --- a/release.json +++ b/release.json @@ -1,10 +1,10 @@ { - "release": "9.0.17", + "release": "9.0.18", "channel": "9.0", - "tag": "v9.0.118", - "sdkVersion": "9.0.118", - "runtimeVersion": "9.0.17", - "aspNetCoreVersion": "9.0.17", + "tag": "v9.0.119", + "sdkVersion": "9.0.119", + "runtimeVersion": "9.0.18", + "aspNetCoreVersion": "9.0.18", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "0e130a2a48932020769116917601ab164ad8d781" + "sourceVersion": "d088fc83496a99a5785ecdf74c012f61a335c338" } diff --git a/sources b/sources index de9f808..9b4e25e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dotnet-9.0.118.tar.gz) = 7fcafd75240c84469605acaa2e639e522579984c2e0af9706e322d41543d250ad6d56d4d10d3ff2084ed4bedf280d1359eaefd0323bdf51b9e2884b1f49fcd61 +SHA512 (dotnet-9.0.119.tar.gz) = bdb5e0bd73b7edf0cc7bf72d9ef07a31691c442bf436e1e25c7d3ac5ee02768bf405a28c004df62db1bb3f0553cb47d6dbd894106667186c7187a13138e23a09