summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2020-12-12 15:52:22 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2020-12-12 15:52:22 (GMT)
commit81ebf2a55a0f8ab2bd89415b090ce3fb6a9a81c1 (patch)
tree625f5ca62803fabf3e8539f514e64f1288109883
parentff30d3b2ef597e80e79319adb658f07ff2eb3fb8 (diff)
downloadDoxygen-81ebf2a55a0f8ab2bd89415b090ce3fb6a9a81c1.zip
Doxygen-81ebf2a55a0f8ab2bd89415b090ce3fb6a9a81c1.tar.gz
Doxygen-81ebf2a55a0f8ab2bd89415b090ce3fb6a9a81c1.tar.bz2
More fixes
-rw-r--r--.github/workflows/build_cmake.yml16
1 files changed, 8 insertions, 8 deletions
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
index edeb7b7..2573ac6 100644
--- a/.github/workflows/build_cmake.yml
+++ b/.github/workflows/build_cmake.yml
@@ -4,8 +4,8 @@ on: [push, pull_request]
jobs:
build:
- name: ${ { matrix.config.name } }
- runs-on: ${ { matrix.config.os } }
+ name: ${{ matrix.config.name }}
+ runs-on: ${{ matrix.config.os }}
strategy:
fail-fast: false
matrix:
@@ -21,16 +21,16 @@ jobs:
- name: Configure
shell: cmake -P {0}
run: |
- set(ENV{CC} ${ { matrix.config.cc } })
- set(ENV{CXX} ${ { matrix.config.cxx } })
+ set(ENV{CC} ${{ matrix.config.cc }})
+ set(ENV{CXX} ${{ matrix.config.cxx }})
file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/ninja" ninja_program)
execute_process(
- COMMAND ${ { steps.cmake_and_ninja.outputs.cmake_dir } }/cmake
+ COMMAND ${{ steps.cmake_and_ninja.outputs.cmake_dir }}/cmake
-S .
-B build
- -D CMAKE_BUILD_TYPE=${ { matrix.config.build_type } }
+ -D CMAKE_BUILD_TYPE=${{ matrix.config.build_type }}
-G Ninja
-D CMAKE_MAKE_PROGRAM=${ninja_program}
RESULT_VARIABLE result
@@ -45,7 +45,7 @@ jobs:
set(ENV{NINJA_STATUS} "[%f/%t %o/sec] ")
execute_process(
- COMMAND ${ { steps.cmake_and_ninja.outputs.cmake_dir } }/cmake --build build
+ COMMAND ${{ steps.cmake_and_ninja.outputs.cmake_dir }}/cmake --build build
RESULT_VARIABLE result
)
if (NOT result EQUAL 0)
@@ -59,7 +59,7 @@ jobs:
ProcessorCount(N)
execute_process(
- COMMAND ${ { steps.cmake_and_ninja.outputs.cmake_dir } }/ctest -j ${N}
+ COMMAND ${{ steps.cmake_and_ninja.outputs.cmake_dir }}/ctest -j ${N}
WORKING_DIRECTORY build
RESULT_VARIABLE result
)