jasder
/
simdjson
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Add MSYS target for msys2 github workflow (#1075) 

* Add MSYS target for msys2 github workflow

* Minimized differences in mingw/mingw64 CI workflows
This commit is contained in:
PavelP 2020-07-27 01:33:57 +06:00 committed by GitHub
parent 9fb83e61ea
commit e95c22eb21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/mingw-ci.yml vendored
View File

@ -26,7 +26,7 @@ jobs:
path: | path: |
C:\ProgramData\scoop C:\ProgramData\scoop
key: scoop32 # static key: should be good forever key: scoop32 # static key: should be good forever
- name: Setup Windows # This should almost never run if the cache works. - name: Setup Windows # This should almost never run if the cache works.
if: steps.cache.outputs.cache-hit != 'true' if: steps.cache.outputs.cache-hit != 'true'
shell: powershell shell: powershell
run: | run: |

4
.github/workflows/mingw64-ci.yml vendored
View File

@ -20,13 +20,12 @@ jobs:
steps: # To reproduce what is below, start a powershell with administrative rights, using scoop *is* a good idea steps: # To reproduce what is below, start a powershell with administrative rights, using scoop *is* a good idea
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions/cache@v2 # we cache the scoop setup with 64-bit GCC - uses: actions/cache@v2 # we cache the scoop setup with 64-bit GCC
id: cache id: cache
with: with:
path: | path: |
C:\ProgramData\scoop C:\ProgramData\scoop
key: scoop64 # static key: should be good forever key: scoop64 # static key: should be good forever
- name: Setup Windows # This should almost never run if the cache works. - name: Setup Windows # This should almost never run if the cache works.
if: steps.cache.outputs.cache-hit != 'true' if: steps.cache.outputs.cache-hit != 'true'
shell: powershell shell: powershell
@ -52,4 +51,3 @@ jobs:
cmake -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_COMPETITION=OFF -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_ENABLE_THREADS=OFF .. cmake -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_COMPETITION=OFF -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_ENABLE_THREADS=OFF ..
cmake --build . --target parse_many_test jsoncheck basictests numberparsingcheck stringparsingcheck errortests integer_tests pointercheck --verbose cmake --build . --target parse_many_test jsoncheck basictests numberparsingcheck stringparsingcheck errortests integer_tests pointercheck --verbose
ctest . -R "(parse_many_test|jsoncheck|basictests|stringparsingcheck|numberparsingcheck|errortests|integer_tests|pointercheck)" --output-on-failure ctest . -R "(parse_many_test|jsoncheck|basictests|stringparsingcheck|numberparsingcheck|errortests|integer_tests|pointercheck)" --output-on-failure

3
.github/workflows/msys2.yml vendored
View File

@ -9,7 +9,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
mingw: ["MINGW32", "MINGW64"] mingw: ["MINGW32", "MINGW64", "MSYS"]
env: env:
CMAKE_GENERATOR: MSYS Makefiles CMAKE_GENERATOR: MSYS Makefiles
@ -26,4 +26,3 @@ jobs:
cmake -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_DO_NOT_USE_THREADS_NO_MATTER_WHAT=ON .. cmake -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_DO_NOT_USE_THREADS_NO_MATTER_WHAT=ON ..
cmake --build . --verbose cmake --build . --verbose
ctest -j4 --output-on-failure -E checkperf ctest -j4 --output-on-failure -E checkperf