Skip to content

Commit 2ad259d

Browse files
committed
Fix how environment flags are populated
1 parent 4524d21 commit 2ad259d

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

.github/workflows/osrm-backend.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,15 @@ jobs:
215215
runs-on: ${{ matrix.runner || 'ubuntu-24.04' }}
216216

217217
env:
218-
BUILD_TYPE: ${{ matrix.type }}
219-
CCOMPILER: ${{ matrix.compiler }}
220-
CXXCOMPILER: ${{ startsWith(matrix.compiler, 'gcc') && format('g++-{0}', matrix.compiler) || contains(matrix.compiler, 'clang-') && format('clang++{0}', matrix.compiler) || matrix.compiler }}
218+
BUILD_TYPE: ${{ matrix.config.type }}
219+
CCOMPILER: ${{ matrix.config.compiler || matrix.config.name }}
220+
CXXCOMPILER: >-
221+
${{
222+
startsWith(matrix.config.name, 'gcc-') && format('g++-{0}', matrix.config.name) ||
223+
startsWith(matrix.config.name, 'clang-') && format('clang++-{0}', matrix.config.name) ||
224+
matrix.config.name == 'clang' && 'clang++' ||
225+
matrix.config.compiler
226+
}}
221227
CXXFLAGS: ${{ matrix.flags }}
222228
ENABLE_COVERAGE: ${{ matrix.coverage && 'ON' || 'OFF' }}
223229
ENABLE_SANITIZER: ${{ matrix.sanitizer && 'ON' || 'OFF' }}

0 commit comments

Comments
 (0)