From 94c4651ed93f4f5ca30d4490518b44e3be4739cf Mon Sep 17 00:00:00 2001 From: Ivan Zhakov Date: Tue, 21 Jun 2022 14:19:25 +0000 Subject: Rename .github/workflows/cmake.yml to .github/workflows/windows.yml. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1902139 13f79535-47bb-0310-9956-ffa450edef68 --- .github/workflows/cmake.yml | 42 ------------------------------------------ .github/workflows/windows.yml | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 .github/workflows/cmake.yml create mode 100644 .github/workflows/windows.yml (limited to '.github') diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml deleted file mode 100644 index 2b3976f6a..000000000 --- a/.github/workflows/cmake.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: CMake - -on: - push: - branches: [ "trunk", "1.8.x" ] - pull_request: - branches: [ "trunk" ] - -jobs: - build: - strategy: - matrix: - os: [windows-latest] - build-type: [Debug, Release] - generator: [ "Visual Studio 17 2022" ] - arch: [ "Win32", "x64" ] - toolset: [ "v143", "v142", "v141" ] - fail-fast: false - - name: "MSVC ${{ matrix.toolset }} ${{ matrix.arch }} [${{ matrix.build-type }}] on ${{ matrix.os }}" - # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac. - # You can convert this to a matrix build if you need cross-platform coverage. - # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix - runs-on: ${{ matrix.os }} - - steps: - - uses: actions/checkout@v3 - - - 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 ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DAPR_BUILD_TESTAPR=ON -G "${{ matrix.generator }}" -A ${{ matrix.arch }} -T ${{ matrix.toolset }} - - - name: Build - # Build your program with the given configuration - run: cmake --build ${{github.workspace}}/build --config ${{ matrix.build-type }} - - - name: Test - working-directory: ${{github.workspace}}/build - # Execute tests defined by the CMake configuration. - # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail - run: ctest -C ${{ matrix.build-type }} --output-on-failure diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml new file mode 100644 index 000000000..e706d1f36 --- /dev/null +++ b/.github/workflows/windows.yml @@ -0,0 +1,42 @@ +name: Windows + +on: + push: + branches: [ "trunk", "1.8.x" ] + pull_request: + branches: [ "trunk" ] + +jobs: + build: + strategy: + matrix: + os: [windows-latest] + build-type: [Debug, Release] + generator: [ "Visual Studio 17 2022" ] + arch: [ "Win32", "x64" ] + toolset: [ "v143", "v142", "v141" ] + fail-fast: false + + name: "MSVC ${{ matrix.toolset }} ${{ matrix.arch }} [${{ matrix.build-type }}] on ${{ matrix.os }}" + # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac. + # You can convert this to a matrix build if you need cross-platform coverage. + # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix + runs-on: ${{ matrix.os }} + + steps: + - uses: actions/checkout@v3 + + - 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 ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DAPR_BUILD_TESTAPR=ON -G "${{ matrix.generator }}" -A ${{ matrix.arch }} -T ${{ matrix.toolset }} + + - name: Build + # Build your program with the given configuration + run: cmake --build ${{github.workspace}}/build --config ${{ matrix.build-type }} + + - name: Test + working-directory: ${{github.workspace}}/build + # Execute tests defined by the CMake configuration. + # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail + run: ctest -C ${{ matrix.build-type }} --output-on-failure -- cgit v1.2.1