From e9a9bd05333379a7e539424cf90e22aeec8cde2f Mon Sep 17 00:00:00 2001 From: FrancoisCarouge Date: Sun, 9 Apr 2023 21:55:22 -0700 Subject: [PATCH] [cicd] remove C compiler from this C++ project --- .github/workflows/pipeline.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index e1c31ce6b..0781645ad 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -14,11 +14,11 @@ jobs: fail-fast: false matrix: include: - - { os: "ubuntu-latest", compiler: {cpp: "clang++", c: "clang"}, generator: "Unix Makefiles" } - - { os: "ubuntu-latest", compiler: {cpp: "g++", c: "gcc"}, generator: "Unix Makefiles" } - - { os: "windows-latest", compiler: {cpp: "cl", c: "cl"}, generator: "Ninja", config: "Debug" } - - { os: "windows-latest", compiler: {cpp: "cl", c: "cl"}, generator: "Ninja", config: "Release" } - name: "${{ matrix.os }} / ${{ matrix.compiler.cpp }} / ${{ matrix.generator }} / ${{ matrix.config }}" + - { os: "ubuntu-latest", compiler: "clang++", generator: "Unix Makefiles" } + - { os: "ubuntu-latest", compiler: "g++", generator: "Unix Makefiles" } + - { os: "windows-latest", compiler: "cl", generator: "Ninja", config: "Debug" } + - { os: "windows-latest", compiler: "cl", generator: "Ninja", config: "Release" } + name: "${{ matrix.os }} / ${{ matrix.compiler }} / ${{ matrix.generator }} / ${{ matrix.config }}" runs-on: "${{ matrix.os }}" steps: - name: "Checkout" @@ -27,8 +27,7 @@ jobs: uses: ilammy/msvc-dev-cmd@v1 - name: "Configure" env: - CC: "${{ matrix.compiler.c }}" - CXX: "${{ matrix.compiler.cpp }}" + CXX: "${{ matrix.compiler }}" run: cmake -S . -B "build" -G "${{ matrix.generator }}" - name: "Build" run: cmake --build "build" --config "${{ matrix.config }}" --verbose --parallel 4