Skip to content

Commit

Permalink
use action to install ninja
Browse files Browse the repository at this point in the history
  • Loading branch information
nam20485 committed Oct 17, 2023
1 parent 18e5f94 commit 9190ae3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 69 deletions.
27 changes: 5 additions & 22 deletions .github/workflows/cmake-multi-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: CMake on multiple platforms

on:
push:
branches: [ "development" ]
branches: [ "development", "main" ]
pull_request:
branches: [ "development" ]

Expand Down Expand Up @@ -32,35 +32,18 @@ jobs:

steps:
- uses: actions/checkout@v3

# - name: Set reusable strings
# # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
# id: strings
# shell: bash
# run: |
# echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
- uses: seanmiddleditch/gha-setup-ninja@master

# Install vcpkg
- name: Install vcpkg
run: |
git clone https://github.com/Microsoft/vcpkg.git ${{env.VCPKG_ROOT}}
${{env.VCPKG_ROOT}}/bootstrap-vcpkg.sh
${{env.VCPKG_ROOT}}/bootstrap-vcpkg.sh
- name: Configure
run: cmake --preset ${{matrix.preset}}
# - name: Configure CMake
# # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
# run: >
# cmake -B ${{ steps.strings.outputs.build-output-dir }}
# -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
# -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
# -S ${{ github.workspace }}
run: cmake --preset ${{matrix.preset}}

- name: Build
# Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
#run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}
run: cmake --preset ${{matrix.preset}} --build

# - name: Test
Expand Down
47 changes: 0 additions & 47 deletions .github/workflows/cmake-single-platform.yml

This file was deleted.

0 comments on commit 9190ae3

Please sign in to comment.