fix: upgrade 20.04 runners to 22.04 (fix for ICC, NVHPC) (#5621)

dyollb · web-flow · commit 5c498583cc01 · 2025-04-16T08:13:23.000-04:00
* Upgrade the deprecated 20.04 runners to 22.04 (ICC, NVHPC)

* fix ICC compile error

---------

Co-authored-by: Bryn Lloyd &lt;12702862+dyollb@users.noreply.github.com&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -432,7 +432,7 @@ jobs:
 
   # Testing on Ubuntu + NVHPC (previous PGI) compilers, which seems to require more workarounds
   ubuntu-nvhpc7:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: "🐍 3 • NVHPC 23.5 • C++17 • x64"
 
     env:
@@ -550,7 +550,7 @@ jobs:
 
   # Testing on ICC using the oneAPI apt repo
   icc:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     name: "🐍 3 • ICC latest • x64"
 
diff --git a/include/pybind11/chrono.h b/include/pybind11/chrono.h
@@ -185,7 +185,7 @@ class type_caster<std::chrono::time_point<std::chrono::system_clock, Duration>>
         using us_t = duration<int, std::micro>;
         auto us = duration_cast<us_t>(src.time_since_epoch() % seconds(1));
         if (us.count() < 0) {
-            us += seconds(1);
+            us += duration_cast<us_t>(seconds(1));
         }
 
         // Subtract microseconds BEFORE `system_clock::to_time_t`, because:

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ class type_caster<std::chrono::time_point<std::chrono::system_clock, Duration>>`
`185`	`185`	`using us_t = duration<int, std::micro>;`
`186`	`186`	`auto us = duration_cast<us_t>(src.time_since_epoch() % seconds(1));`
`187`	`187`	`if (us.count() < 0) {`
`188`		`- us += seconds(1);`
	`188`	`+ us += duration_cast<us_t>(seconds(1));`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	// Subtract microseconds BEFORE `system_clock::to_time_t`, because: