aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2021-03-24 19:20:38 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2021-03-24 19:30:21 +0300
commit5c02449c11ff50e3808d12e5241f03a8bf886477 (patch)
treeefd85e626f826712f4ae2d71db72e87cfd9b3459
parentupdate cmake-common (diff)
downloadwinapi-utf8-5c02449c11ff50e3808d12e5241f03a8bf886477.tar.gz
winapi-utf8-5c02449c11ff50e3808d12e5241f03a8bf886477.zip
update cmake-common
GitHub Actions workers no longer have pre-built Boost.
-rw-r--r--.github/workflows/ci.yml23
m---------cmake0
2 files changed, 11 insertions, 12 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0edee47..5f990dd 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.72.0
+ TOOLSET: '${{ matrix.toolset }}'
+ PLATFORM: '${{ matrix.platform }}'
+ CONFIGURATION: '${{ matrix.configuration }}'
+ BOOST_VERSION: 1.72.0
defaults:
run:
shell: pwsh
@@ -57,20 +57,19 @@ 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
- python -m project.ci.github.cmake --install -- -D WINAPI_UTF8_TESTS=ON
- - name: Upload the binaries
+ python -m project.ci.cmake --install -- -D WINAPI_UTF8_TESTS=ON
+ - name: Upload binaries
uses: actions/upload-artifact@v2
with:
name: 'winapi-utf8-${{ matrix.os }}-${{ matrix.toolset }}-${{ matrix.platform }}-${{ matrix.configuration }}'
- path: '${{ runner.workspace }}/install/'
- - name: Run unit tests
- run: ../install/bin/winapi-utf8-unit-tests
+ path: '${{ runner.workspace }}/build/install/'
+ - name: Test
+ run: ../build/install/bin/winapi-utf8-unit-tests
if: runner.os == 'Windows'
diff --git a/cmake b/cmake
-Subproject d4673a2ff058529488dddf2e0520ee68ec88a0c
+Subproject e5de0b18453dd2fb3bf3e02414ee00ee185d81d