diff options
| -rw-r--r-- | .github/workflows/ci.yml | 33 | ||||
| m--------- | cmake | 0 |
2 files changed, 16 insertions, 17 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aaec253..5da18f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,10 +36,10 @@ jobs: runs-on: '${{ matrix.os }}' name: 'Build: ${{ matrix.os }} / ${{ matrix.toolset }} / ${{ matrix.platform }} / ${{ matrix.configuration }}' env: - toolset: '${{ matrix.toolset }}' - platform: '${{ matrix.platform }}' - configuration: '${{ matrix.configuration }}' - boost_version: 1.65.0 + TOOLSET: '${{ matrix.toolset }}' + PLATFORM: '${{ matrix.platform }}' + CONFIGURATION: '${{ matrix.configuration }}' + BOOST_VERSION: 1.65.0 defaults: run: shell: pwsh @@ -57,11 +57,10 @@ jobs: with: platform: '${{ matrix.platform }}' if: matrix.toolset == 'mingw' - - name: Boost (MinGW) + - name: Build Boost run: | cd cmake - python -m project.ci.github.boost -- --with-test - if: matrix.toolset == 'mingw' + python -m project.ci.boost -- --with-test - name: Build run: | cd cmake @@ -70,12 +69,12 @@ jobs: } else { @() } - python -m project.ci.github.cmake --install $flags - - name: Upload the binaries + python -m project.ci.cmake --install $flags + - name: Upload binaries uses: actions/upload-artifact@v2 with: name: 'winapi-common-${{ matrix.os }}-${{ matrix.toolset }}-${{ matrix.platform }}-${{ matrix.configuration }}' - path: '${{ runner.workspace }}/install/' + path: '${{ runner.workspace }}/build/install/' - name: Make test logs directory run: mkdir ../test_logs if: runner.os == 'Windows' @@ -87,10 +86,10 @@ jobs: '--report_sink=..\test_logs\report.txt', '--run_test=!console_tests,process_console_tests', '--', - '--echo_exe=..\install\bin\winapi-common-test-echo.exe', - '--worker_exe=..\install\bin\winapi-common-test-worker.exe' + '--echo_exe=..\build\install\bin\winapi-common-test-echo.exe', + '--worker_exe=..\build\install\bin\winapi-common-test-worker.exe' ) - ..\install\bin\winapi-common-unit-tests.exe $args + ..\build\install\bin\winapi-common-unit-tests.exe $args if: runner.os == 'Windows' - name: Check test report (w/o console tests) run: | @@ -106,11 +105,11 @@ jobs: '--report_sink=..\test_logs\report_console.txt', '--run_test=console_tests,process_console_tests', '--', - '--echo_exe=..\install\bin\winapi-common-test-echo.exe', - '--worker_exe=..\install\bin\winapi-common-test-worker.exe' + '--echo_exe=..\build\install\bin\winapi-common-test-echo.exe', + '--worker_exe=..\build\install\bin\winapi-common-test-worker.exe' ) Start-Process ` - -FilePath ..\install\bin\winapi-common-unit-tests.exe ` + -FilePath ..\build\install\bin\winapi-common-unit-tests.exe ` -ArgumentList $args ` -Wait if: runner.os == 'Windows' @@ -120,7 +119,7 @@ jobs: $last_line = Get-Content ..\test_logs\report_console.txt -Tail 1 $($last_line -eq '*** No errors detected') -or $(throw $last_line) if: runner.os == 'Windows' - - name: Upload the test logs + - name: Upload test logs uses: actions/upload-artifact@v2 with: name: 'test_logs-${{ matrix.os }}-${{ matrix.platform }}-${{ matrix.configuration }}' diff --git a/cmake b/cmake -Subproject d4673a2ff058529488dddf2e0520ee68ec88a0c +Subproject e5de0b18453dd2fb3bf3e02414ee00ee185d81d |