From c9e83a4bbe71820aca0a38f9f31ddda10fd13a2c Mon Sep 17 00:00:00 2001
From: Evan Nemerson <evan@nemerson.com>
Date: Sun, 15 Sep 2024 21:48:16 -0400
Subject: [PATCH] ci: switch ICC builds to ubuntu 20.04

Hopefully this resolves a glibc incompatibility with older versions
---
 .github/workflows/ci.yml | 18 +++++++++---------
 hedley.h                 | 10 +++++++---
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e39d76b..cfcad7e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,7 +51,7 @@ jobs:
   #       working-directory: test
 
   icc:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -62,14 +62,14 @@ jobs:
         # - "2021.3.0"
         - "2021.4.0"
         - "2022.0.1"
-        # - "2022.0.2"
-        # - "2022.1.0"
-        # - "2022.2.0"
-        # - "2022.2.1"
-        # - "2023.0.0"
-        # - "2023.1.0"
-        # - "2023.2.0"
-        # - "2023.2.1"
+        - "2022.0.2"
+        - "2022.1.0"
+        - "2022.2.0"
+        - "2022.2.1"
+        - "2023.0.0"
+        - "2023.1.0"
+        - "2023.2.0"
+        - "2023.2.1"
     steps:
       - uses: actions/checkout@v4
       - name: Free some disk space
diff --git a/hedley.h b/hedley.h
index 23e88f4..9ab18e4 100644
--- a/hedley.h
+++ b/hedley.h
@@ -1729,7 +1729,7 @@ HEDLEY_DIAGNOSTIC_POP
 #if \
   ( \
     HEDLEY_HAS_ATTRIBUTE(fallthrough) && \
-    (!defined(HEDLEY_INTEL_VERSION) || HEDLEY_INTEL_VERSION_CHECK(20,22,0)) \
+    (!defined(HEDLEY_INTEL_VERSION) || HEDLEY_INTEL_VERSION_CHECK(20,21,5) || 1) \
   ) || \
   HEDLEY_GCC_VERSION_CHECK(7,0,0) || \
   HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
@@ -1737,10 +1737,14 @@ HEDLEY_DIAGNOSTIC_POP
 #elif \
   ( \
     HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang,fallthrough) && \
-    (!defined(HEDLEY_INTEL_VERSION) || HEDLEY_INTEL_VERSION_CHECK(20,22,0)) \
+    (!defined(HEDLEY_INTEL_VERSION) || HEDLEY_INTEL_VERSION_CHECK(20,21,5)) \
   )
 #  define HEDLEY_FALL_THROUGH HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]])
-#elif HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough)
+#elif \
+  ( \
+    HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough) && \
+    (!defined(HEDLEY_INTEL_VERSION) || HEDLEY_INTEL_VERSION_CHECK(20,21,5)) \
+  )
 #  define HEDLEY_FALL_THROUGH HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[fallthrough]])
 #elif defined(__fallthrough) /* SAL */
 #  define HEDLEY_FALL_THROUGH __fallthrough