From 23c88a5c02bdff1199c17df916350825faaafbf9 Mon Sep 17 00:00:00 2001 From: Chris Cranford Date: Sat, 30 Dec 2023 20:37:02 -0500 Subject: [PATCH] GH-43 Combine build steps --- .github/workflows/build.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b2dfca9c..2eb2593f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,20 +80,18 @@ jobs: with: key: ccache-${{ matrix.identifier }} - - name: Configure CMake (Linux/MacOS) + - name: Build Orchestrator (Linux/MacOS) if: startsWith(matrix.identifier, 'linux-') || startsWith(matrix.identifier, 'macos-') shell: sh run: | cmake -B ${{ github.workspace }}/.out-${{ matrix.identifier }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -S ${{ github.workspace }} -G Ninja + cmake --build ${{ github.workspace }}/.out-${{ matrix.identifier }} --target orchestrator -j 18 - - name: Configure CMake (Windows) + - name: Build Orchestrator (Windows) if: startsWith(matrix.identifier, 'windows-') run: | cmake -B ${{ github.workspace }}/.out-${{ matrix.identifier }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=cl -DCMAKE_C_COMPILER=cl -S ${{ github.workspace }} -G Ninja - - - name: Build Orchestrator - run: | - cmake --build ${{ github.workspace }}/.out-${{ matrix.identifier }} --target orchestrator -j 18 + cmake --build ${{ github.workspace }}/.out-${{ matrix.identifier }} --target orchestrator -j 18 - name: Prepare addon files shell: bash