From 5260bfe8137523924aaa5dfe1628ea2216fecb46 Mon Sep 17 00:00:00 2001 From: Manuel Schneider Date: Tue, 15 Aug 2023 12:54:08 +0200 Subject: [PATCH] update --- .github/workflows/ci.yml | 103 +++++++++++++-------------------------- 1 file changed, 35 insertions(+), 68 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8cd94f05..8577f94d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,13 +1,42 @@ name: CI + on: push: branches: - - "master" - - "macosbuild" - pull_request: - branches: [ "master" ] - workflow_dispatch: -#jobs: + - "macosbuild" + +jobs: + #linux-dockerized: + + macos: + + + +jobs: + build: + runs-on: ${{ matrix.os }} + + strategy: + fail-fast: false + matrix: + os: [macos-11, macos-12, macos-13] + build_type: [Release] + c_compiler: [gcc, clang] + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Install Qt + uses: jurplel/install-qt-action@v3 + with: + cache: true + + - name: Configure & Build + uses: lukka/run-cmake@v10 + + + # build: # runs-on: macos-12 # steps: @@ -36,65 +65,3 @@ on: # submodules: recursive # - uses: lukka/get-cmake@latest - - -jobs: - build: - runs-on: ${{ matrix.os }} - - strategy: - # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable. - fail-fast: false - - # Set up a matrix to run the following 3 configurations: - # 1. - # 2. - # 3. - # - # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list. - matrix: - os: - - ubuntu-22.04 - - macos-13 - - macos-12 - - macos-11 - build_type: - - Release - c_compiler: [gcc, clang] - include: - - os: ubuntu-22.04 - c_compiler: gcc - cpp_compiler: g++ - - 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" - - - 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 }} - -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} - -S ${{ github.workspace }} - - - 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 }} - -# - name: Test -# working-directory: ${{ steps.strings.outputs.build-output-dir }} -# # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator). -# # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail -# run: ctest --build-config ${{ matrix.build_type }} - - -