8000 Add MSYS target for msys2 github workflow (#1075) · JavaScriptExpert/simdjson@e95c22e · GitHub
[go: up one dir, main page]
Skip to content

Commit e95c22e

Browse files
pps83pps83
authored
Add MSYS target for msys2 github workflow (simdjson#1075)
* Add MSYS target for msys2 github workflow * Minimized differences in mingw/mingw64 CI workflows
1 parent 9fb83e6 commit e95c22e

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

‎.github/workflows/mingw-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
path: |
2727
C:\ProgramData\scoop
2828
key: scoop32 # static key: should be good forever
29-
- name: Setup Windows # This should almost never run if the cache works.
29+
- name: Setup Windows # This should almost never run if the cache works.
3030
if: steps.cache.outputs.cache-hit != 'true'
3131
shell: powershell
3232
run: |
@@ -35,7 +35,7 @@ jobs:
3535
sudo scoop install git --global
3636
sudo scoop install ninja --global
3737
sudo scoop install cmake --global
38-
sudo scoop install gcc --arch 32bit --global
38+
sudo scoop install gcc --arch 32bit --global
3939
$env:path
4040
Write-Host 'Everything has been installed, you are good!'
4141
- name: Build and Test 32-bit x86

‎.github/workflows/mingw64-ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ jobs:
2020
steps: # To reproduce what is below, start a powershell with administrative rights, using scoop *is* a good idea
2121
- uses: actions/checkout@v2
2222

23-
2423
- uses: actions/cache@v2 # we cache the scoop setup with 64-bit GCC
2524
id: cache
2625
with:
2726
path: |
2827
C:\ProgramData\scoop
29-
key: scoop64 # static key: should be good forever
28+
key: scoop64 # static key: should be good forever
3029
- name: Setup Windows # This should almost never run if the cache works.
3130
if: steps.cache.outputs.cache-hit != 'true'
3231
shell: powershell
@@ -52,4 +51,3 @@ jobs:
5251
cmake -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_COMPETITION=OFF -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_ENABLE_THREADS=OFF ..
5352
cmake --build . --target parse_many_test jsoncheck basictests numberparsingcheck stringparsingcheck errortests integer_tests pointercheck --verbose
5453
ctest . -R "(parse_many_test|jsoncheck|basictests|stringparsingcheck|numberparsingcheck|errortests|integer_tests|pointercheck)" --output-on-failure
55-

‎.github/workflows/msys2.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
mingw: ["MINGW32", "MINGW64"]
12+
mingw: ["MINGW32", "MINGW64", "MSYS"]
1313
env:
1414
CMAKE_GENERATOR: MSYS Makefiles
1515

@@ -26,4 +26,3 @@ jobs:
2626
cmake -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_DO_NOT_USE_THREADS_NO_MATTER_WHAT=ON ..
2727
cmake --build . --verbose
2828
ctest -j4 --output-on-failure -E checkperf
29-

0 commit comments

Comments
 (0)
0