diff --git a/.github/workflows/mingw-ci.yml b/.github/workflows/mingw-ci.yml index 63523b05..05822599 100644 --- a/.github/workflows/mingw-ci.yml +++ b/.github/workflows/mingw-ci.yml @@ -26,7 +26,7 @@ jobs: path: | C:\ProgramData\scoop 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' shell: powershell run: | @@ -35,7 +35,7 @@ jobs: sudo scoop install git --global sudo scoop install ninja --global sudo scoop install cmake --global - sudo scoop install gcc --arch 32bit --global + sudo scoop install gcc --arch 32bit --global $env:path Write-Host 'Everything has been installed, you are good!' - name: Build and Test 32-bit x86 diff --git a/.github/workflows/mingw64-ci.yml b/.github/workflows/mingw64-ci.yml index 85815b47..8b9b2785 100644 --- a/.github/workflows/mingw64-ci.yml +++ b/.github/workflows/mingw64-ci.yml @@ -20,13 +20,12 @@ jobs: steps: # To reproduce what is below, start a powershell with administrative rights, using scoop *is* a good idea - uses: actions/checkout@v2 - - uses: actions/cache@v2 # we cache the scoop setup with 64-bit GCC id: cache with: path: | 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. if: steps.cache.outputs.cache-hit != 'true' shell: powershell @@ -52,4 +51,3 @@ jobs: 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 ctest . -R "(parse_many_test|jsoncheck|basictests|stringparsingcheck|numberparsingcheck|errortests|integer_tests|pointercheck)" --output-on-failure - diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml index afa1da23..cf4499da 100644 --- a/.github/workflows/msys2.yml +++ b/.github/workflows/msys2.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: false matrix: - mingw: ["MINGW32", "MINGW64"] + mingw: ["MINGW32", "MINGW64", "MSYS"] env: CMAKE_GENERATOR: MSYS Makefiles @@ -26,4 +26,3 @@ jobs: cmake -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_DO_NOT_USE_THREADS_NO_MATTER_WHAT=ON .. cmake --build . --verbose ctest -j4 --output-on-failure -E checkperf -