Skip to content

Commit 0d352e7

Browse files
committed
Revert "Fix how environment flags are populated"
This reverts commit 2ad259d.
1 parent 2ad259d commit 0d352e7

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

.github/workflows/osrm-backend.yml

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

217217
env:
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-
}}
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 }}
227221
CXXFLAGS: ${{ matrix.flags }}
228222
ENABLE_COVERAGE: ${{ matrix.coverage && 'ON' || 'OFF' }}
229223
ENABLE_SANITIZER: ${{ matrix.sanitizer && 'ON' || 'OFF' }}

0 commit comments

Comments
 (0)