Skip to content

Commit 4951181

Browse files
committed
Translate the compioler install name to the CXX command for B2.
1 parent 7b7ab3f commit 4951181

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ name: CI
88
on: [ push, pull_request ]
99
jobs:
1010
ubuntu:
11-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-24.04
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
compiler: [ g++-14, clang++-19 ]
15+
compiler: [ gcc-14, clang-19 ]
1616
cxxstd: [ 14, 17, 20, 23 ]
1717
steps:
1818
- uses: actions/checkout@master
@@ -23,8 +23,10 @@ jobs:
2323
commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[apple];[Apple];[APPLE]'
2424
commit-filter-separator: ';'
2525
fail-fast: true
26-
- name: Set TOOLSET
27-
run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV
26+
- name: Set ENV
27+
run: |
28+
echo ${{ matrix.compiler }} | awk '/^gcc/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV
29+
echo ${{ matrix.compiler }} | awk '/^gcc/ { gsub(/gcc/,"CXX=g++"); print; } /^clang/ { gsub(/clang/,"CXX=clang++"); print; }' >> $GITHUB_ENV
2830
- name: Install packages
2931
run: sudo apt install ${{ matrix.compiler }}
3032
- name: Checkout main boost
@@ -45,7 +47,7 @@ jobs:
4547
run: ./b2 headers
4648
working-directory: ../boost-root
4749
- name: Generate user config
48-
run: 'echo "using $TOOLSET : : ${{ matrix.compiler }} ;" > ~/user-config.jam'
50+
run: 'echo "using $TOOLSET : : $CXX ;" > ~/user-config.jam'
4951
working-directory: ../boost-root
5052
- name: Config info
5153
run: ../../../b2 print_config_info toolset=$TOOLSET cxxstd=${{ matrix.cxxstd }}

0 commit comments

Comments
 (0)