aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/.github/workflows
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2021-03-24 19:41:10 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2021-03-24 19:44:36 +0300
commit9e65c7ea51e2f6e0e211ec83cddd24371d7aea7f (patch)
tree8e6bebd464f035d9999e1eaa953559ec7451e915 /.github/workflows
parentuse SafeInt to make integers a bit more safe (diff)
downloadwinapi-common-9e65c7ea51e2f6e0e211ec83cddd24371d7aea7f.tar.gz
winapi-common-9e65c7ea51e2f6e0e211ec83cddd24371d7aea7f.zip
update cmake-common
GitHub Actions workers no longer have pre-built Boost.
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/ci.yml33
1 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 }}'