Skip to content

Commit

Permalink
ci: switch ICC builds to ubuntu 20.04
Browse files Browse the repository at this point in the history
Hopefully this resolves a glibc incompatibility with older versions
  • Loading branch information
nemequ committed Sep 16, 2024
1 parent 88f045f commit c9e83a4
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
# working-directory: test

icc:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
Expand All @@ -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
Expand Down
10 changes: 7 additions & 3 deletions hedley.h
Original file line number Diff line number Diff line change
Expand Up @@ -1729,18 +1729,22 @@ 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)
# define HEDLEY_FALL_THROUGH __attribute__((__fallthrough__))
#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
Expand Down

0 comments on commit c9e83a4

Please sign in to comment.