Skip to content

Commit 6422b60

Browse files
committed
gh-actions: adapt to currently available compiler versions
1 parent 89101b5 commit 6422b60

File tree

2 files changed

+18
-38
lines changed

2 files changed

+18
-38
lines changed

.github/workflows/cmake-build-ci.gen

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,13 @@ const MAP = [
4040
'env.CC_VER' => [
4141
"new" => "-10",
4242
"cur" => "-9",
43-
"old" => "-8"
4443
]
4544
],
4645
"clang" => [
4746
'env.CC_VER' => [
48-
"new" => "-10",
49-
"cur" => "-9",
50-
"old" => "-8"
47+
"new" => "-11",
48+
"cur" => "-10",
49+
"old" => "-9"
5150
]
5251
]
5352
]
@@ -56,16 +55,14 @@ const MAP = [
5655
'env.CC_VND' => [
5756
"gnu" => [
5857
'env.CC_VER' => [
59-
"new" => "-9",
60-
"cur" => "-8",
58+
"new" => "-10",
59+
"cur" => "-9",
6160
"old" => "-7"
6261
]
6362
],
6463
"clang" => [
6564
'env.CC_VER' => [
66-
"new" => "-9",
67-
"cur" => "-8",
68-
"old" => "-6.0"
65+
"cur" => "-9",
6966
]
7067
]
7168
]

.github/workflows/cmake-build-ci.yml

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -449,63 +449,46 @@ jobs:
449449
run: |
450450
echo CC="gcc-9" >> ${GITHUB_ENV}
451451
echo CXX="g++-9" >> ${GITHUB_ENV}
452-
- name: Prepare environment (for old gnu on ubuntu-20.04)
453-
if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='gnu') && (env.CC_VER=='old')
454-
run: |
455-
echo CC="gcc-8" >> ${GITHUB_ENV}
456-
echo CXX="g++-8" >> ${GITHUB_ENV}
457452
- name: Prepare environment (for new clang on ubuntu-20.04)
458453
if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='clang') && (env.CC_VER=='new')
459454
run: |
460-
echo CC="clang-10" >> ${GITHUB_ENV}
461-
echo CXX="clang++-10" >> ${GITHUB_ENV}
455+
echo CC="clang-11" >> ${GITHUB_ENV}
456+
echo CXX="clang++-11" >> ${GITHUB_ENV}
462457
echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
463458
- name: Prepare environment (for cur clang on ubuntu-20.04)
464459
if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='clang') && (env.CC_VER=='cur')
465460
run: |
466-
echo CC="clang-9" >> ${GITHUB_ENV}
467-
echo CXX="clang++-9" >> ${GITHUB_ENV}
461+
echo CC="clang-10" >> ${GITHUB_ENV}
462+
echo CXX="clang++-10" >> ${GITHUB_ENV}
468463
echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
469464
echo INSTALL_CXX="libc++-9-dev libc++abi-9-dev" >> ${GITHUB_ENV}
470465
- name: Prepare environment (for old clang on ubuntu-20.04)
471466
if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='clang') && (env.CC_VER=='old')
472467
run: |
473-
echo CC="clang-8" >> ${GITHUB_ENV}
474-
echo CXX="clang++-8" >> ${GITHUB_ENV}
468+
echo CC="clang-9" >> ${GITHUB_ENV}
469+
echo CXX="clang++-9" >> ${GITHUB_ENV}
475470
echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
476471
echo INSTALL_CXX="libc++-8-dev libc++abi-8-dev" >> ${GITHUB_ENV}
477472
- name: Prepare environment (for new gnu on ubuntu-18.04)
478473
if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='gnu') && (env.CC_VER=='new')
479474
run: |
480-
echo CC="gcc-9" >> ${GITHUB_ENV}
481-
echo CXX="g++-9" >> ${GITHUB_ENV}
475+
echo CC="gcc-10" >> ${GITHUB_ENV}
476+
echo CXX="g++-10" >> ${GITHUB_ENV}
482477
- name: Prepare environment (for cur gnu on ubuntu-18.04)
483478
if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='gnu') && (env.CC_VER=='cur')
484479
run: |
485-
echo CC="gcc-8" >> ${GITHUB_ENV}
486-
echo CXX="g++-8" >> ${GITHUB_ENV}
480+
echo CC="gcc-9" >> ${GITHUB_ENV}
481+
echo CXX="g++-9" >> ${GITHUB_ENV}
487482
- name: Prepare environment (for old gnu on ubuntu-18.04)
488483
if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='gnu') && (env.CC_VER=='old')
489484
run: |
490485
echo CC="gcc-7" >> ${GITHUB_ENV}
491486
echo CXX="g++-7" >> ${GITHUB_ENV}
492-
- name: Prepare environment (for new clang on ubuntu-18.04)
493-
if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='clang') && (env.CC_VER=='new')
494-
run: |
495-
echo CC="clang-9" >> ${GITHUB_ENV}
496-
echo CXX="clang++-9" >> ${GITHUB_ENV}
497-
echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
498487
- name: Prepare environment (for cur clang on ubuntu-18.04)
499488
if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='clang') && (env.CC_VER=='cur')
500489
run: |
501-
echo CC="clang-8" >> ${GITHUB_ENV}
502-
echo CXX="clang++-8" >> ${GITHUB_ENV}
503-
echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
504-
- name: Prepare environment (for old clang on ubuntu-18.04)
505-
if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='clang') && (env.CC_VER=='old')
506-
run: |
507-
echo CC="clang-6.0" >> ${GITHUB_ENV}
508-
echo CXX="clang++-6.0" >> ${GITHUB_ENV}
490+
echo CC="clang-9" >> ${GITHUB_ENV}
491+
echo CXX="clang++-9" >> ${GITHUB_ENV}
509492
echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
510493
- name: Install dependencies (Linux)
511494
if: runner.os == 'Linux'

0 commit comments

Comments
 (0)