Skip to content

Commit 734d39f

Browse files
committed
gh-actions: fix libc++ versions
1 parent 6422b60 commit 734d39f

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,23 +71,18 @@ const MAP = [
7171
];
7272
const ENV = [
7373
"ubuntu-20.04" => [
74-
"gnu" => [
75-
"new" => [
76-
"INSTALL_CC" => "gcc-10",
77-
"INSTALL_CXX" => "g++-10",
78-
]
79-
],
8074
"clang" => [
8175
"new" => [
82-
"CXXFLAGS" => "-stdlib=libc++"
76+
"CXXFLAGS" => "-stdlib=libc++",
77+
"INSTALL_CXX" => "libc++-11-dev libc++abi-11-dev"
8378
],
8479
"cur" => [
8580
"CXXFLAGS" => "-stdlib=libc++",
86-
"INSTALL_CXX" => "libc++-9-dev libc++abi-9-dev"
81+
"INSTALL_CXX" => "libc++-10-dev libc++abi-10-dev"
8782
],
8883
"old" => [
8984
"CXXFLAGS" => "-stdlib=libc++",
90-
"INSTALL_CXX" => "libc++-8-dev libc++abi-8-dev"
85+
"INSTALL_CXX" => "libc++-9-dev libc++abi-9-dev"
9186
],
9287
]
9388
],

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -442,8 +442,6 @@ jobs:
442442
run: |
443443
echo CC="gcc-10" >> ${GITHUB_ENV}
444444
echo CXX="g++-10" >> ${GITHUB_ENV}
445-
echo INSTALL_CC="gcc-10" >> ${GITHUB_ENV}
446-
echo INSTALL_CXX="g++-10" >> ${GITHUB_ENV}
447445
- name: Prepare environment (for cur gnu on ubuntu-20.04)
448446
if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='gnu') && (env.CC_VER=='cur')
449447
run: |
@@ -455,20 +453,21 @@ jobs:
455453
echo CC="clang-11" >> ${GITHUB_ENV}
456454
echo CXX="clang++-11" >> ${GITHUB_ENV}
457455
echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
456+
echo INSTALL_CXX="libc++-11-dev libc++abi-11-dev" >> ${GITHUB_ENV}
458457
- name: Prepare environment (for cur clang on ubuntu-20.04)
459458
if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='clang') && (env.CC_VER=='cur')
460459
run: |
461460
echo CC="clang-10" >> ${GITHUB_ENV}
462461
echo CXX="clang++-10" >> ${GITHUB_ENV}
463462
echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
464-
echo INSTALL_CXX="libc++-9-dev libc++abi-9-dev" >> ${GITHUB_ENV}
463+
echo INSTALL_CXX="libc++-10-dev libc++abi-10-dev" >> ${GITHUB_ENV}
465464
- name: Prepare environment (for old clang on ubuntu-20.04)
466465
if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='clang') && (env.CC_VER=='old')
467466
run: |
468467
echo CC="clang-9" >> ${GITHUB_ENV}
469468
echo CXX="clang++-9" >> ${GITHUB_ENV}
470469
echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
471-
echo INSTALL_CXX="libc++-8-dev libc++abi-8-dev" >> ${GITHUB_ENV}
470+
echo INSTALL_CXX="libc++-9-dev libc++abi-9-dev" >> ${GITHUB_ENV}
472471
- name: Prepare environment (for new gnu on ubuntu-18.04)
473472
if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='gnu') && (env.CC_VER=='new')
474473
run: |

0 commit comments

Comments
 (0)