From 3a2bd6df5bcfd32d9dc49a20c92ec8b2837733fc Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 13:31:21 -0800
Subject: [PATCH 01/33] test commit 1

---
 .github/workflows/dev-long-tests.yml  |  520 ++++++------
 .github/workflows/dev-short-tests.yml | 1049 +++++++++++++------------
 2 files changed, 795 insertions(+), 774 deletions(-)

diff --git a/.github/workflows/dev-long-tests.yml b/.github/workflows/dev-long-tests.yml
index f75f61f8e39..d932e76318e 100644
--- a/.github/workflows/dev-long-tests.yml
+++ b/.github/workflows/dev-long-tests.yml
@@ -1,286 +1,286 @@
-name: dev-long-tests
-# Tests longer than 10mn
+# name: dev-long-tests
+# # Tests longer than 10mn
 
-concurrency:
-  group: long-${{ github.ref }}
-  cancel-in-progress: true
+# concurrency:
+#   group: long-${{ github.ref }}
+#   cancel-in-progress: true
 
-on:
-  pull_request:
-    branches: [ dev, release, actionsTest ]
+# on:
+#   pull_request:
+#     branches: [ dev, release, actionsTest ]
 
-jobs:
-  make-all:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: make all
-      run: make all
+# jobs:
+#   make-all:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: make all
+#       run: make all
 
-  # lasts ~24mn
-  make-test:
-    runs-on: ubuntu-latest
-    env:
-      DEVNULLRIGHTS: 1
-      READFROMBLOCKDEVICE: 1
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: make test
-      run: make test
+#   # lasts ~24mn
+#   make-test:
+#     runs-on: ubuntu-latest
+#     env:
+#       DEVNULLRIGHTS: 1
+#       READFROMBLOCKDEVICE: 1
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: make test
+#       run: make test
 
-  # lasts ~26mn
-  make-test-osx:
-    runs-on: macos-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: OS-X test
-      run: make test # make -c lib all doesn't work because of the fact that it's not a tty
+#   # lasts ~26mn
+#   make-test-osx:
+#     runs-on: macos-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: OS-X test
+#       run: make test # make -c lib all doesn't work because of the fact that it's not a tty
 
-  no-intrinsics-fuzztest:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: no intrinsics fuzztest
-      run: MOREFLAGS="-DZSTD_NO_INTRINSICS" make -C tests fuzztest
+#   no-intrinsics-fuzztest:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: no intrinsics fuzztest
+#       run: MOREFLAGS="-DZSTD_NO_INTRINSICS" make -C tests fuzztest
 
-  tsan-zstreamtest:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: thread sanitizer zstreamtest
-      run: CC=clang ZSTREAM_TESTTIME=-T3mn make tsan-test-zstream
+#   tsan-zstreamtest:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: thread sanitizer zstreamtest
+#       run: CC=clang ZSTREAM_TESTTIME=-T3mn make tsan-test-zstream
 
-  ubsan-zstreamtest:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: undefined behavior sanitizer zstreamtest
-      run: CC=clang make uasan-test-zstream
+#   ubsan-zstreamtest:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: undefined behavior sanitizer zstreamtest
+#       run: CC=clang make uasan-test-zstream
 
-  # lasts ~15mn
-  tsan-fuzztest:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: thread sanitizer fuzztest
-      run: CC=clang make tsan-fuzztest
+#   # lasts ~15mn
+#   tsan-fuzztest:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: thread sanitizer fuzztest
+#       run: CC=clang make tsan-fuzztest
 
-  # lasts ~23mn
-  gcc-8-asan-ubsan-testzstd:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: gcc-8 + ASan + UBSan + Test Zstd
-      # See https://askubuntu.com/a/1428822
-      run: |
-        echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu focal main universe" | sudo tee -a /etc/apt/sources.list
-        sudo apt-get -qqq update
-        make gcc8install
-        CC=gcc-8 make -j uasan-test-zstd </dev/null V=1
+#   # lasts ~23mn
+#   gcc-8-asan-ubsan-testzstd:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: gcc-8 + ASan + UBSan + Test Zstd
+#       # See https://askubuntu.com/a/1428822
+#       run: |
+#         echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu focal main universe" | sudo tee -a /etc/apt/sources.list
+#         sudo apt-get -qqq update
+#         make gcc8install
+#         CC=gcc-8 make -j uasan-test-zstd </dev/null V=1
 
-  clang-asan-ubsan-testzstd:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: clang + ASan + UBSan + Test Zstd
-      run: CC=clang make -j uasan-test-zstd </dev/null V=1
+#   clang-asan-ubsan-testzstd:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: clang + ASan + UBSan + Test Zstd
+#       run: CC=clang make -j uasan-test-zstd </dev/null V=1
 
-  gcc-asan-ubsan-testzstd-32bit:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: ASan + UBSan + Test Zstd, 32bit mode
-      run: |
-        sudo apt-get -qqq update
-        make libc6install
-        make -j uasan-test-zstd32 V=1
+#   gcc-asan-ubsan-testzstd-32bit:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: ASan + UBSan + Test Zstd, 32bit mode
+#       run: |
+#         sudo apt-get -qqq update
+#         make libc6install
+#         make -j uasan-test-zstd32 V=1
 
-    # Note : external libraries must be turned off when using MSAN tests,
-    # because they are not msan-instrumented,
-    # so any data coming from these libraries is always considered "uninitialized"
+#     # Note : external libraries must be turned off when using MSAN tests,
+#     # because they are not msan-instrumented,
+#     # so any data coming from these libraries is always considered "uninitialized"
 
-  gcc-8-asan-ubsan-fuzz:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: gcc-8 + ASan + UBSan + Fuzz Test
-      # See https://askubuntu.com/a/1428822
-      run: |
-        echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu focal main universe" | sudo tee -a /etc/apt/sources.list
-        sudo apt-get -qqq update
-        make gcc8install
-        CC=gcc-8 FUZZER_FLAGS="--long-tests" make clean uasan-fuzztest
+#   gcc-8-asan-ubsan-fuzz:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: gcc-8 + ASan + UBSan + Fuzz Test
+#       # See https://askubuntu.com/a/1428822
+#       run: |
+#         echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu focal main universe" | sudo tee -a /etc/apt/sources.list
+#         sudo apt-get -qqq update
+#         make gcc8install
+#         CC=gcc-8 FUZZER_FLAGS="--long-tests" make clean uasan-fuzztest
 
-  clang-asan-ubsan-fuzz:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: clang + ASan + UBSan + Fuzz Test
-      run: CC=clang FUZZER_FLAGS="--long-tests" make clean uasan-fuzztest
+#   clang-asan-ubsan-fuzz:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: clang + ASan + UBSan + Fuzz Test
+#       run: CC=clang FUZZER_FLAGS="--long-tests" make clean uasan-fuzztest
 
-  gcc-asan-ubsan-fuzz32:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: ASan + UBSan + Fuzz Test 32bit
-      run: |
-        sudo apt-get -qqq update
-        make libc6install
-        CFLAGS="-O3 -m32" FUZZER_FLAGS="--long-tests" make uasan-fuzztest
+#   gcc-asan-ubsan-fuzz32:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: ASan + UBSan + Fuzz Test 32bit
+#       run: |
+#         sudo apt-get -qqq update
+#         make libc6install
+#         CFLAGS="-O3 -m32" FUZZER_FLAGS="--long-tests" make uasan-fuzztest
 
-  clang-asan-ubsan-fuzz32:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: clang + ASan + UBSan + Fuzz Test 32bit
-      run: |
-        sudo apt-get -qqq update
-        make libc6install
-        CC=clang CFLAGS="-O3 -m32" FUZZER_FLAGS="--long-tests" make uasan-fuzztest
+#   clang-asan-ubsan-fuzz32:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: clang + ASan + UBSan + Fuzz Test 32bit
+#       run: |
+#         sudo apt-get -qqq update
+#         make libc6install
+#         CC=clang CFLAGS="-O3 -m32" FUZZER_FLAGS="--long-tests" make uasan-fuzztest
 
-  asan-ubsan-regression:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: ASan + UBSan + Regression Test
-      run: make -j uasanregressiontest
+#   asan-ubsan-regression:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: ASan + UBSan + Regression Test
+#       run: make -j uasanregressiontest
 
-  clang-ubsan-regression:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: clang + ASan + UBSan + Regression Test
-      run: CC=clang make -j uasanregressiontest
+#   clang-ubsan-regression:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: clang + ASan + UBSan + Regression Test
+#       run: CC=clang make -j uasanregressiontest
 
-  msan-regression:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: MSan + Regression Test
-      run: make -j msanregressiontest
+#   msan-regression:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: MSan + Regression Test
+#       run: make -j msanregressiontest
 
-  clang-msan-fuzz:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: clang + MSan + Fuzz Test
-      run: |
-        sudo apt-get -qqq update
-        sudo apt-get install clang
-        CC=clang FUZZER_FLAGS="--long-tests" make clean msan-fuzztest
+#   clang-msan-fuzz:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: clang + MSan + Fuzz Test
+#       run: |
+#         sudo apt-get -qqq update
+#         sudo apt-get install clang
+#         CC=clang FUZZER_FLAGS="--long-tests" make clean msan-fuzztest
 
-  # lasts ~24mn
-  clang-msan-testzstd:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: clang + MSan + Test Zstd
-      run: |
-        sudo apt-get update
-        sudo apt-get install clang
-        CC=clang make msan-test-zstd HAVE_ZLIB=0 HAVE_LZ4=0 HAVE_LZMA=0 V=1
+#   # lasts ~24mn
+#   clang-msan-testzstd:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: clang + MSan + Test Zstd
+#       run: |
+#         sudo apt-get update
+#         sudo apt-get install clang
+#         CC=clang make msan-test-zstd HAVE_ZLIB=0 HAVE_LZ4=0 HAVE_LZMA=0 V=1
 
-  armfuzz:
-      runs-on: ubuntu-latest
-      steps:
-      - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-      - name: Qemu ARM emulation + Fuzz Test
-        run: |
-          sudo apt-get -qqq update
-          make arminstall
-          make armfuzz
+#   armfuzz:
+#       runs-on: ubuntu-latest
+#       steps:
+#       - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#       - name: Qemu ARM emulation + Fuzz Test
+#         run: |
+#           sudo apt-get -qqq update
+#           make arminstall
+#           make armfuzz
 
-  valgrind-fuzz-test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: valgrind + fuzz test stack mode    # ~ 7mn
-      shell: 'script -q -e -c "bash {0}"'
-      run: |
-        sudo apt-get -qqq update
-        make valgrindinstall
-        make -C tests test-valgrind
-        make clean
-        make -C tests test-fuzzer-stackmode
+#   valgrind-fuzz-test:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: valgrind + fuzz test stack mode    # ~ 7mn
+#       shell: 'script -q -e -c "bash {0}"'
+#       run: |
+#         sudo apt-get -qqq update
+#         make valgrindinstall
+#         make -C tests test-valgrind
+#         make clean
+#         make -C tests test-fuzzer-stackmode
 
-  mingw-long-test:
-    runs-on: windows-2019
-    strategy:
-      fail-fast: false
-      matrix:
-        include: [
-          { compiler: clang, platform: x64, action: build, script: "MOREFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion -Wno-unused-command-line-argument -Wno-implicit-int-float-conversion' make -j allzstd V=1"},
-          { compiler: gcc, platform: x64, action: test, script: ""},
-        ]
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: Mingw long test
-      run: |
-        $env:PATH_ORIGINAL = $env:PATH
-        $env:PATH_MINGW32 = "C:\msys64\mingw32\bin"
-        $env:PATH_MINGW64 = "C:\msys64\mingw64\bin"
-        COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw32\bin\make.exe
-        COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw64\bin\make.exe
-        IF ("${{matrix.platform}}" -eq "x64")
-        {
-            $env:PATH = $env:PATH_MINGW64 + ";" + $env:PATH_ORIGINAL
-        }
-        ELSEIF ("${{matrix.platform}}" -eq "x86")
-        {
-            $env:PATH = $env:PATH_MINGW32 + ";" + $env:PATH_ORIGINAL
-        }
-        IF ("${{matrix.action}}" -eq "build")
-        {
-          make -v
-          sh -c "${{matrix.compiler}} -v"
-          ECHO "Building zlib to static link"
-          $env:CC = "${{matrix.compiler}}"
-          sh -c "cd .. && git clone --depth 1 --branch v1.2.11 https://github.com/madler/zlib"
-          sh -c "cd ../zlib && make -f win32/Makefile.gcc libz.a"
-          ECHO "Building zstd"
-          $env:CPPFLAGS = "-I../../zlib"
-          $env:LDFLAGS = "../../zlib/libz.a"
-          sh -c "${{matrix.script}}"
-        }
-        ELSEIF ("${{matrix.action}}" -eq "test")
-        {
-            ECHO "Testing ${{matrix.compiler}} ${{matrix.platform}}"
-            $env:CC = "gcc"
-            $env:CXX = "g++"
-            MKDIR build\cmake\build
-            CD build\cmake\build
-            $env:FUZZERTEST = "-T2mn"
-            $env:ZSTREAM_TESTTIME = "-T2mn"
-            cmake -G "Visual Studio 14 2015 Win64" ..
-            cd ..\..\..
-            make clean
-        }
+#   mingw-long-test:
+#     runs-on: windows-2019
+#     strategy:
+#       fail-fast: false
+#       matrix:
+#         include: [
+#           { compiler: clang, platform: x64, action: build, script: "MOREFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion -Wno-unused-command-line-argument -Wno-implicit-int-float-conversion' make -j allzstd V=1"},
+#           { compiler: gcc, platform: x64, action: test, script: ""},
+#         ]
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: Mingw long test
+#       run: |
+#         $env:PATH_ORIGINAL = $env:PATH
+#         $env:PATH_MINGW32 = "C:\msys64\mingw32\bin"
+#         $env:PATH_MINGW64 = "C:\msys64\mingw64\bin"
+#         COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw32\bin\make.exe
+#         COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw64\bin\make.exe
+#         IF ("${{matrix.platform}}" -eq "x64")
+#         {
+#             $env:PATH = $env:PATH_MINGW64 + ";" + $env:PATH_ORIGINAL
+#         }
+#         ELSEIF ("${{matrix.platform}}" -eq "x86")
+#         {
+#             $env:PATH = $env:PATH_MINGW32 + ";" + $env:PATH_ORIGINAL
+#         }
+#         IF ("${{matrix.action}}" -eq "build")
+#         {
+#           make -v
+#           sh -c "${{matrix.compiler}} -v"
+#           ECHO "Building zlib to static link"
+#           $env:CC = "${{matrix.compiler}}"
+#           sh -c "cd .. && git clone --depth 1 --branch v1.2.11 https://github.com/madler/zlib"
+#           sh -c "cd ../zlib && make -f win32/Makefile.gcc libz.a"
+#           ECHO "Building zstd"
+#           $env:CPPFLAGS = "-I../../zlib"
+#           $env:LDFLAGS = "../../zlib/libz.a"
+#           sh -c "${{matrix.script}}"
+#         }
+#         ELSEIF ("${{matrix.action}}" -eq "test")
+#         {
+#             ECHO "Testing ${{matrix.compiler}} ${{matrix.platform}}"
+#             $env:CC = "gcc"
+#             $env:CXX = "g++"
+#             MKDIR build\cmake\build
+#             CD build\cmake\build
+#             $env:FUZZERTEST = "-T2mn"
+#             $env:ZSTREAM_TESTTIME = "-T2mn"
+#             cmake -G "Visual Studio 14 2015 Win64" ..
+#             cd ..\..\..
+#             make clean
+#         }
 
-  # lasts ~20mn
-  oss-fuzz:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sanitizer: [address, undefined, memory]
-    steps:
-    - name: Build Fuzzers (${{ matrix.sanitizer }})
-      id: build
-      uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
-      with:
-        oss-fuzz-project-name: 'zstd'
-        dry-run: false
-        sanitizer: ${{ matrix.sanitizer }}
-    - name: Run Fuzzers (${{ matrix.sanitizer }})
-      uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
-      with:
-        oss-fuzz-project-name: 'zstd'
-        fuzz-seconds: 600
-        dry-run: false
-        sanitizer: ${{ matrix.sanitizer }}
-    - name: Upload Crash
-      uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # tag=v3.1.1
-      if: failure() && steps.build.outcome == 'success'
-      with:
-        name: ${{ matrix.sanitizer }}-artifacts
-        path: ./out/artifacts
+#   # lasts ~20mn
+#   oss-fuzz:
+#     runs-on: ubuntu-latest
+#     strategy:
+#       fail-fast: false
+#       matrix:
+#         sanitizer: [address, undefined, memory]
+#     steps:
+#     - name: Build Fuzzers (${{ matrix.sanitizer }})
+#       id: build
+#       uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
+#       with:
+#         oss-fuzz-project-name: 'zstd'
+#         dry-run: false
+#         sanitizer: ${{ matrix.sanitizer }}
+#     - name: Run Fuzzers (${{ matrix.sanitizer }})
+#       uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
+#       with:
+#         oss-fuzz-project-name: 'zstd'
+#         fuzz-seconds: 600
+#         dry-run: false
+#         sanitizer: ${{ matrix.sanitizer }}
+#     - name: Upload Crash
+#       uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # tag=v3.1.1
+#       if: failure() && steps.build.outcome == 'success'
+#       with:
+#         name: ${{ matrix.sanitizer }}-artifacts
+#         path: ./out/artifacts
diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index b9998e024f2..ddcb991c13a 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -11,521 +11,542 @@ on:
     branches: [ dev, release, actionsTest ]
 
 jobs:
-  linux-kernel:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: linux kernel, library + build + test
-      run: make -C contrib/linux-kernel test CFLAGS="-Werror -Wunused-const-variable -Wunused-but-set-variable"
-
-  benchmarking:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: make benchmarking
-      run: make benchmarking
-
-  check-32bit: # designed to catch https://github.com/facebook/zstd/issues/2428
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: make check on 32-bit
-      run: |
-        sudo apt update
-        APT_PACKAGES="gcc-multilib" make apt-install
-        CFLAGS="-m32 -O1 -fstack-protector" make check V=1
-
-  check-x32:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: make check on x32 ABI # https://en.wikipedia.org/wiki/X32_ABI
-      env:
-        CHECK_CONSTRAINED_MEM: true
-      run: |
-        sudo apt update
-        APT_PACKAGES="gcc-multilib" make apt-install
-        CFLAGS="-mx32 -O1 -fstack-protector" make check V=1
-
-  gcc-7-libzstd:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: gcc-7 + libzstdmt compilation
-      # See https://askubuntu.com/a/1428822
-      run: |
-        echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu focal main universe" | sudo tee -a /etc/apt/sources.list
-        sudo apt-get -qqq update
-        make gcc7install
-        CC=gcc-7 CFLAGS=-Werror make -j all
-        make clean
-        LDFLAGS=-Wl,--no-undefined make -C lib libzstd-mt
-
-    # candidate test (to check) : underlink test
-    # LDFLAGS=-Wl,--no-undefined : will make the linker fail if dll is underlinked
-
-  cmake-build-and-test-check:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: cmake build and test check
-      run: |
-        FUZZERTEST=-T1mn ZSTREAM_TESTTIME=-T1mn make cmakebuild
-        cp -r ./ "../zstd source"
-        cd "../zstd source"
-        FUZZERTEST=-T1mn ZSTREAM_TESTTIME=-T1mn make cmakebuild
-
-  cpp-gnu90-c99-compatibility:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: C++, gnu90 and c99 compatibility
-      run: |
-        make cxxtest
-        make clean
-        make gnu90build
-        make clean
-        make c99build
-        make clean
-        make travis-install   # just ensures `make install` works
-
-  mingw-cross-compilation:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: mingw cross-compilation
-      run: |
-        # sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix; (doesn't work)
-        sudo apt-get -qqq update
-        sudo apt-get install gcc-mingw-w64
-        CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ CFLAGS="-Werror -O1" make zstd
-
-  armbuild:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: ARM Build Test
-      run: |
-        sudo apt-get -qqq update
-        make arminstall
-        make armbuild
-
-  bourne-shell:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: Bourne shell compatibility (shellcheck)
-      run: |
-        wget https://github.com/koalaman/shellcheck/releases/download/v0.7.1/shellcheck-v0.7.1.linux.x86_64.tar.xz
-        tar -xf shellcheck-v0.7.1.linux.x86_64.tar.xz
-        shellcheck-v0.7.1/shellcheck --shell=sh --severity=warning --exclude=SC2010 tests/playTests.sh
-
-  zlib-wrapper:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: zlib wrapper test
-      run: |
-        sudo apt-get -qqq update
-        make valgrindinstall
-        make -C zlibWrapper test
-        make -C zlibWrapper test-valgrind
-
-  lz4-threadpool-libs:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: LZ4, thread pool, and libs build testslib wrapper test
-      run: |
-        make lz4install
-        make -C tests test-lz4
-        make check < /dev/null | tee   # mess with lz4 console detection
-        make clean
-        make -C tests test-pool
-        make clean
-        bash tests/libzstd_builds.sh
-
-  gcc-make-tests-32bit:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: Make all, 32bit mode
-      run: |
-        sudo apt-get -qqq update
-        make libc6install
-        CFLAGS="-Werror -m32" make -j all32
-
-  gcc-8-make:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-      - name: gcc-8 build
-        # See https://askubuntu.com/a/1428822
-        run: |
-          echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu focal main universe" | sudo tee -a /etc/apt/sources.list
-          sudo apt-get -qqq update
-          make gcc8install
-          CC=gcc-8 CFLAGS="-Werror" make -j all
+#   linux-kernel:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: linux kernel, library + build + test
+#       run: make -C contrib/linux-kernel test CFLAGS="-Werror -Wunused-const-variable -Wunused-but-set-variable"
+
+#   benchmarking:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: make benchmarking
+#       run: make benchmarking
+
+#   check-32bit: # designed to catch https://github.com/facebook/zstd/issues/2428
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: make check on 32-bit
+#       run: |
+#         sudo apt update
+#         APT_PACKAGES="gcc-multilib" make apt-install
+#         CFLAGS="-m32 -O1 -fstack-protector" make check V=1
+
+#   check-x32:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: make check on x32 ABI # https://en.wikipedia.org/wiki/X32_ABI
+#       env:
+#         CHECK_CONSTRAINED_MEM: true
+#       run: |
+#         sudo apt update
+#         APT_PACKAGES="gcc-multilib" make apt-install
+#         CFLAGS="-mx32 -O1 -fstack-protector" make check V=1
+
+#   gcc-7-libzstd:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: gcc-7 + libzstdmt compilation
+#       # See https://askubuntu.com/a/1428822
+#       run: |
+#         echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu focal main universe" | sudo tee -a /etc/apt/sources.list
+#         sudo apt-get -qqq update
+#         make gcc7install
+#         CC=gcc-7 CFLAGS=-Werror make -j all
+#         make clean
+#         LDFLAGS=-Wl,--no-undefined make -C lib libzstd-mt
+
+#     # candidate test (to check) : underlink test
+#     # LDFLAGS=-Wl,--no-undefined : will make the linker fail if dll is underlinked
+
+#   cmake-build-and-test-check:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: cmake build and test check
+#       run: |
+#         FUZZERTEST=-T1mn ZSTREAM_TESTTIME=-T1mn make cmakebuild
+#         cp -r ./ "../zstd source"
+#         cd "../zstd source"
+#         FUZZERTEST=-T1mn ZSTREAM_TESTTIME=-T1mn make cmakebuild
+
+#   cpp-gnu90-c99-compatibility:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: C++, gnu90 and c99 compatibility
+#       run: |
+#         make cxxtest
+#         make clean
+#         make gnu90build
+#         make clean
+#         make c99build
+#         make clean
+#         make travis-install   # just ensures `make install` works
+
+#   mingw-cross-compilation:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: mingw cross-compilation
+#       run: |
+#         # sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix; (doesn't work)
+#         sudo apt-get -qqq update
+#         sudo apt-get install gcc-mingw-w64
+#         CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ CFLAGS="-Werror -O1" make zstd
+
+#   armbuild:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: ARM Build Test
+#       run: |
+#         sudo apt-get -qqq update
+#         make arminstall
+#         make armbuild
+
+#   bourne-shell:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: Bourne shell compatibility (shellcheck)
+#       run: |
+#         wget https://github.com/koalaman/shellcheck/releases/download/v0.7.1/shellcheck-v0.7.1.linux.x86_64.tar.xz
+#         tar -xf shellcheck-v0.7.1.linux.x86_64.tar.xz
+#         shellcheck-v0.7.1/shellcheck --shell=sh --severity=warning --exclude=SC2010 tests/playTests.sh
+
+#   zlib-wrapper:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: zlib wrapper test
+#       run: |
+#         sudo apt-get -qqq update
+#         make valgrindinstall
+#         make -C zlibWrapper test
+#         make -C zlibWrapper test-valgrind
+
+#   lz4-threadpool-libs:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: LZ4, thread pool, and libs build testslib wrapper test
+#       run: |
+#         make lz4install
+#         make -C tests test-lz4
+#         make check < /dev/null | tee   # mess with lz4 console detection
+#         make clean
+#         make -C tests test-pool
+#         make clean
+#         bash tests/libzstd_builds.sh
+
+#   gcc-make-tests-32bit:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: Make all, 32bit mode
+#       run: |
+#         sudo apt-get -qqq update
+#         make libc6install
+#         CFLAGS="-Werror -m32" make -j all32
+
+#   gcc-8-make:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#       - name: gcc-8 build
+#         # See https://askubuntu.com/a/1428822
+#         run: |
+#           echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu focal main universe" | sudo tee -a /etc/apt/sources.list
+#           sudo apt-get -qqq update
+#           make gcc8install
+#           CC=gcc-8 CFLAGS="-Werror" make -j all
+
+#   implicit-fall-through:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#       - name: -Wimplicit-fallthrough build
+#         run: |
+#           make clean
+#           CC=gcc MOREFLAGS="-Werror -Wimplicit-fallthrough=2 -O0" make -C lib -j libzstd.a ZSTD_LEGACY_SUPPORT=0
+#           make clean
+#           CC=clang MOREFLAGS="-Werror -Wimplicit-fallthrough -O0" make -C lib -j libzstd.a ZSTD_LEGACY_SUPPORT=0
+
+#   meson-linux:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#       - name: Install packages
+#         run: |
+#           sudo apt-get update
+#           sudo apt-get -y install build-essential python3-pip ninja-build liblz4-dev
+#           pip install --pre meson
+#       - name: Build with Meson
+#         run: |
+#           meson setup \
+#             --buildtype=debugoptimized \
+#             -Db_lundef=false \
+#             -Dauto_features=enabled \
+#             -Dbin_programs=true \
+#             -Dbin_tests=true \
+#             -Dbin_contrib=true \
+#             -Ddefault_library=both \
+#             build/meson builddir
+#           ninja -C builddir/
+#           meson test -C builddir/ --print-errorlogs
+#           meson install -C builddir --destdir staging/
+
+#   meson-windows:
+#     runs-on: windows-latest
+#     steps:
+#       - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#       - name: Install packages
+#         run: pip install --pre meson
+#       - name: Initialize the MSVC dev command prompt
+#         uses: ilammy/msvc-dev-cmd@7315a94840631165970262a99c72cfb48a65d25d
+#       - name: Configure with Meson
+#         run: |
+#           meson setup build/meson/ builddir -Dbin_tests=true -Dbin_programs=true -Dbin_contrib=true
+#       - name: Build with Meson
+#         run: |
+#           ninja -C builddir/
+#       - name: Test with Meson
+#         run: |
+#           meson test -C builddir/ --print-errorlogs
+#       - name: Install with Meson
+#         run: |
+#           meson install -C builddir --destdir staging/
+
+#   cmake-visual-2019:
+#     runs-on: windows-2019
+#     strategy:
+#       matrix:
+#         include:
+#           - generator: "Visual Studio 16 2019"
+#             flags: "-A x64"
+#           - generator: "Visual Studio 16 2019"
+#             flags: "-A Win32"
+#           - generator: "MinGW Makefiles"
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: Add MSBuild to PATH
+#       uses: microsoft/setup-msbuild@34cfbaee7f672c76950673338facd8a73f637506 # tag=v1.1.3
+#     - name: Build
+#       working-directory: ${{env.GITHUB_WORKSPACE}}
+#       run: |
+#         cd build\cmake
+#         mkdir build
+#         cd build
+#         cmake.exe -G "${{matrix.generator}}" ${{matrix.flags}} ..
+#         cmake.exe --build .
+
+#   visual-2019:
+#     runs-on: windows-2019
+#     strategy:
+#       matrix:
+#         platform: [x64, Win32]
+#         configuration: [Debug, Release]
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: Add MSBuild to PATH
+#       uses: microsoft/setup-msbuild@34cfbaee7f672c76950673338facd8a73f637506 # tag=v1.1.3
+#     - name: Build
+#       working-directory: ${{env.GITHUB_WORKSPACE}}
+#       # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
+#       run: >
+#         msbuild "build\VS2010\zstd.sln" /m /verbosity:minimal /property:PlatformToolset=v142
+#         /t:Clean,Build /p:Platform=${{matrix.platform}} /p:Configuration=${{matrix.configuration}}
+
+# # TODO: fix as part of https://github.com/facebook/zstd/issues/3064
+# #  visual-2015:
+# #    # only GH actions windows-2016 contains VS 2015
+# #    runs-on: windows-2016
+# #    strategy:
+# #      matrix:
+# #        platform: [x64, Win32]
+# #        configuration: [Debug, Release]
+# #    steps:
+# #    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+# #    - name: Add MSBuild to PATH
+# #      uses: microsoft/setup-msbuild@34cfbaee7f672c76950673338facd8a73f637506 # tag=v1.1.3
+# #    - name: Build
+# #      working-directory: ${{env.GITHUB_WORKSPACE}}
+# #      run: >
+# #        msbuild "build\VS2010\zstd.sln" /m /verbosity:minimal /property:PlatformToolset=v140
+# #        /t:Clean,Build /p:Platform=${{matrix.platform}} /p:Configuration=${{matrix.configuration}}
+
+#   # This tests that we don't accidently grow the size too much.
+#   # If the size grows intentionally, you can raise these numbers.
+#   # But we do need to think about binary size, since it is a concern.
+#   libzstd-size:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: libzstd size test
+#       run: |
+#         make clean && make -j -C lib libzstd && ./tests/check_size.py lib/libzstd.so 1100000
+#         make clean && make -j -C lib libzstd ZSTD_LIB_COMPRESSION=0 ZSTD_LIB_DICTBUILDER=0 && ./tests/check_size.py lib/libzstd.so 400000
+#         make clean && make -j -C lib libzstd ZSTD_LIB_MINIFY=1 && ./tests/check_size.py lib/libzstd.so 300000
+#         make clean && make -j -C lib libzstd ZSTD_LIB_MINIFY=1 ZSTD_LIB_COMPRESSION=0 ZSTD_LIB_DICTBUILDER=0 && ./tests/check_size.py lib/libzstd.so 80000
+
+#   minimal-decompressor-macros:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: minimal decompressor macros
+#       run: |
+#         make clean && make -j all ZSTD_LIB_MINIFY=1 MOREFLAGS="-Werror"
+#         make clean && make check ZSTD_LIB_MINIFY=1 MOREFLAGS="-Werror"
+#         make clean && make -j all MOREFLAGS="-Werror -DHUF_FORCE_DECOMPRESS_X1 -DZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT"
+#         make clean && make check MOREFLAGS="-Werror -DHUF_FORCE_DECOMPRESS_X1 -DZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT"
+#         make clean && make -j all MOREFLAGS="-Werror -DHUF_FORCE_DECOMPRESS_X2 -DZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG"
+#         make clean && make check MOREFLAGS="-Werror -DHUF_FORCE_DECOMPRESS_X2 -DZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG"
+#         make clean && make -j all MOREFLAGS="-Werror -DZSTD_NO_INLINE -DZSTD_STRIP_ERROR_STRINGS"
+#         make clean && make check MOREFLAGS="-Werror -DZSTD_NO_INLINE -DZSTD_STRIP_ERROR_STRINGS"
+
+#   dynamic-bmi2:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: dynamic bmi2 tests
+#       run: |
+#         make clean && make -j check MOREFLAGS="-O0 -Werror -mbmi2"
+#         make clean && make -j check MOREFLAGS="-O0 -Werror -DDYNAMIC_BMI2=1"
+#         make clean && make -j check MOREFLAGS="-O0 -Werror -DDYNAMIC_BMI2=1 -mbmi2"
+#         make clean && make -j check MOREFLAGS="-O0 -Werror -DDYNAMIC_BMI2=0"
+#         make clean && make -j check MOREFLAGS="-O0 -Werror -DDYNAMIC_BMI2=0 -mbmi2"
+
+#   test-variants:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: make all variants & validate
+#       run: |
+#         make -j -C programs allVariants MOREFLAGS=-O0
+#         ./tests/test-variants.sh
+
+
+#   qemu-consistency:
+#     name: QEMU ${{ matrix.name }}
+#     runs-on: ubuntu-20.04
+#     strategy:
+#       fail-fast: false  # 'false' means Don't stop matrix workflows even if some matrix failed.
+#       matrix:
+#         include: [
+#           { name: ARM,      xcc_pkg: gcc-arm-linux-gnueabi,     xcc: arm-linux-gnueabi-gcc,     xemu_pkg: qemu-system-arm,    xemu: qemu-arm-static     },
+#           { name: ARM64,    xcc_pkg: gcc-aarch64-linux-gnu,     xcc: aarch64-linux-gnu-gcc,     xemu_pkg: qemu-system-arm,    xemu: qemu-aarch64-static },
+#           { name: PPC,      xcc_pkg: gcc-powerpc-linux-gnu,     xcc: powerpc-linux-gnu-gcc,     xemu_pkg: qemu-system-ppc,    xemu: qemu-ppc-static     },
+#           { name: PPC64LE,  xcc_pkg: gcc-powerpc64le-linux-gnu, xcc: powerpc64le-linux-gnu-gcc, xemu_pkg: qemu-system-ppc,    xemu: qemu-ppc64le-static },
+#           { name: S390X,    xcc_pkg: gcc-s390x-linux-gnu,       xcc: s390x-linux-gnu-gcc,       xemu_pkg: qemu-system-s390x,  xemu: qemu-s390x-static   },
+#           { name: MIPS,     xcc_pkg: gcc-mips-linux-gnu,        xcc: mips-linux-gnu-gcc,        xemu_pkg: qemu-system-mips,   xemu: qemu-mips-static    },
+#           { name: M68K,     xcc_pkg: gcc-m68k-linux-gnu,        xcc: m68k-linux-gnu-gcc,        xemu_pkg: qemu-system-m68k,   xemu: qemu-m68k-static    },
+#         ]
+#     env:                        # Set environment variables
+#       XCC: ${{ matrix.xcc }}
+#       XEMU: ${{ matrix.xemu }}
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: apt update & install
+#       run: |
+#         sudo apt-get update
+#         sudo apt-get install gcc-multilib g++-multilib qemu-utils qemu-user-static
+#         sudo apt-get install ${{ matrix.xcc_pkg }} ${{ matrix.xemu_pkg }}
+#     - name: Environment info
+#       run: |
+#         echo && which $XCC
+#         echo && $XCC --version
+#         echo && $XCC -v  # Show built-in specs
+#         echo && which $XEMU
+#         echo && $XEMU --version
+#     - name: ARM
+#       if: ${{ matrix.name == 'ARM' }}
+#       run: |
+#         LDFLAGS="-static" CC=$XCC QEMU_SYS=$XEMU make clean check
+#     - name: ARM64
+#       if: ${{ matrix.name == 'ARM64' }}
+#       run: |
+#         LDFLAGS="-static" CC=$XCC QEMU_SYS=$XEMU make clean check
+#     - name: PPC
+#       if: ${{ matrix.name == 'PPC' }}
+#       run: |
+#         LDFLAGS="-static" CC=$XCC QEMU_SYS=$XEMU make clean check
+#     - name: PPC64LE
+#       if: ${{ matrix.name == 'PPC64LE' }}
+#       run: |
+#         LDFLAGS="-static" CC=$XCC QEMU_SYS=$XEMU make clean check
+#     - name: S390X
+#       if: ${{ matrix.name == 'S390X' }}
+#       run: |
+#         LDFLAGS="-static" CC=$XCC QEMU_SYS=$XEMU make clean check
+#     - name: MIPS
+#       if: ${{ matrix.name == 'MIPS' }}
+#       run: |
+#         LDFLAGS="-static" CC=$XCC QEMU_SYS=$XEMU make clean check
+#     - name: M68K
+#       if: ${{ matrix.name == 'M68K' }}
+#       run: |
+#         LDFLAGS="-static" CC=$XCC QEMU_SYS=$XEMU make clean check
+
+#   mingw-short-test:
+#     runs-on: windows-2019
+#     strategy:
+#       fail-fast: false
+#       matrix:
+#         include: [
+#           { compiler: gcc, platform: x64, script: "CFLAGS=-Werror make -j allzstd DEBUGLEVEL=2"},
+#           { compiler: gcc, platform: x86, script: "CFLAGS=-Werror make -j allzstd"},
+#           { compiler: clang, platform: x64, script: "CFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make -j allzstd V=1"},
+#         ]
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: Mingw short test
+#       run: |
+#         ECHO "Building ${{matrix.compiler}} ${{matrix.platform}}"
+#         $env:PATH_ORIGINAL = $env:PATH
+#         $env:PATH_MINGW32 = "C:\msys64\mingw32\bin"
+#         $env:PATH_MINGW64 = "C:\msys64\mingw64\bin"
+#         COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw32\bin\make.exe
+#         COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw64\bin\make.exe
+#         IF ("${{matrix.platform}}" -eq "x64")
+#         {
+#             $env:PATH = $env:PATH_MINGW64 + ";" + $env:PATH_ORIGINAL
+#         }
+#         ELSEIF ("${{matrix.platform}}" -eq "x86")
+#         {
+#             $env:PATH = $env:PATH_MINGW32 + ";" + $env:PATH_ORIGINAL
+#         }
+#         make -v
+#         sh -c "${{matrix.compiler}} -v"
+#         $env:CC = "${{matrix.compiler}}"
+#         sh -c "${{matrix.script}}"
+#         ECHO "Testing ${{matrix.compiler}} ${{matrix.platform}}"
+#         make clean
+#         make check
+
+name: MSYS2
+on: [push, pull_request]
 
-  implicit-fall-through:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-      - name: -Wimplicit-fallthrough build
-        run: |
-          make clean
-          CC=gcc MOREFLAGS="-Werror -Wimplicit-fallthrough=2 -O0" make -C lib -j libzstd.a ZSTD_LEGACY_SUPPORT=0
-          make clean
-          CC=clang MOREFLAGS="-Werror -Wimplicit-fallthrough -O0" make -C lib -j libzstd.a ZSTD_LEGACY_SUPPORT=0
-
-  meson-linux:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-      - name: Install packages
-        run: |
-          sudo apt-get update
-          sudo apt-get -y install build-essential python3-pip ninja-build liblz4-dev
-          pip install --pre meson
-      - name: Build with Meson
-        run: |
-          meson setup \
-            --buildtype=debugoptimized \
-            -Db_lundef=false \
-            -Dauto_features=enabled \
-            -Dbin_programs=true \
-            -Dbin_tests=true \
-            -Dbin_contrib=true \
-            -Ddefault_library=both \
-            build/meson builddir
-          ninja -C builddir/
-          meson test -C builddir/ --print-errorlogs
-          meson install -C builddir --destdir staging/
-
-  meson-windows:
+jobs:
+  msys2-ucrt64:
     runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
     steps:
-      - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-      - name: Install packages
-        run: pip install --pre meson
-      - name: Initialize the MSVC dev command prompt
-        uses: ilammy/msvc-dev-cmd@7315a94840631165970262a99c72cfb48a65d25d
-      - name: Configure with Meson
-        run: |
-          meson setup build/meson/ builddir -Dbin_tests=true -Dbin_programs=true -Dbin_contrib=true
-      - name: Build with Meson
-        run: |
-          ninja -C builddir/
-      - name: Test with Meson
-        run: |
-          meson test -C builddir/ --print-errorlogs
-      - name: Install with Meson
-        run: |
-          meson install -C builddir --destdir staging/
-
-  cmake-visual-2019:
-    runs-on: windows-2019
-    strategy:
-      matrix:
-        include:
-          - generator: "Visual Studio 16 2019"
-            flags: "-A x64"
-          - generator: "Visual Studio 16 2019"
-            flags: "-A Win32"
-          - generator: "MinGW Makefiles"
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@34cfbaee7f672c76950673338facd8a73f637506 # tag=v1.1.3
-    - name: Build
-      working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: |
-        cd build\cmake
-        mkdir build
-        cd build
-        cmake.exe -G "${{matrix.generator}}" ${{matrix.flags}} ..
-        cmake.exe --build .
-
-  visual-2019:
-    runs-on: windows-2019
-    strategy:
-      matrix:
-        platform: [x64, Win32]
-        configuration: [Debug, Release]
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@34cfbaee7f672c76950673338facd8a73f637506 # tag=v1.1.3
-    - name: Build
-      working-directory: ${{env.GITHUB_WORKSPACE}}
-      # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
-      run: >
-        msbuild "build\VS2010\zstd.sln" /m /verbosity:minimal /property:PlatformToolset=v142
-        /t:Clean,Build /p:Platform=${{matrix.platform}} /p:Configuration=${{matrix.configuration}}
-
-# TODO: fix as part of https://github.com/facebook/zstd/issues/3064
-#  visual-2015:
-#    # only GH actions windows-2016 contains VS 2015
-#    runs-on: windows-2016
-#    strategy:
-#      matrix:
-#        platform: [x64, Win32]
-#        configuration: [Debug, Release]
-#    steps:
-#    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-#    - name: Add MSBuild to PATH
-#      uses: microsoft/setup-msbuild@34cfbaee7f672c76950673338facd8a73f637506 # tag=v1.1.3
-#    - name: Build
-#      working-directory: ${{env.GITHUB_WORKSPACE}}
-#      run: >
-#        msbuild "build\VS2010\zstd.sln" /m /verbosity:minimal /property:PlatformToolset=v140
-#        /t:Clean,Build /p:Platform=${{matrix.platform}} /p:Configuration=${{matrix.configuration}}
-
-  # This tests that we don't accidently grow the size too much.
-  # If the size grows intentionally, you can raise these numbers.
-  # But we do need to think about binary size, since it is a concern.
-  libzstd-size:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: libzstd size test
-      run: |
-        make clean && make -j -C lib libzstd && ./tests/check_size.py lib/libzstd.so 1100000
-        make clean && make -j -C lib libzstd ZSTD_LIB_COMPRESSION=0 ZSTD_LIB_DICTBUILDER=0 && ./tests/check_size.py lib/libzstd.so 400000
-        make clean && make -j -C lib libzstd ZSTD_LIB_MINIFY=1 && ./tests/check_size.py lib/libzstd.so 300000
-        make clean && make -j -C lib libzstd ZSTD_LIB_MINIFY=1 ZSTD_LIB_COMPRESSION=0 ZSTD_LIB_DICTBUILDER=0 && ./tests/check_size.py lib/libzstd.so 80000
-
-  minimal-decompressor-macros:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: minimal decompressor macros
-      run: |
-        make clean && make -j all ZSTD_LIB_MINIFY=1 MOREFLAGS="-Werror"
-        make clean && make check ZSTD_LIB_MINIFY=1 MOREFLAGS="-Werror"
-        make clean && make -j all MOREFLAGS="-Werror -DHUF_FORCE_DECOMPRESS_X1 -DZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT"
-        make clean && make check MOREFLAGS="-Werror -DHUF_FORCE_DECOMPRESS_X1 -DZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT"
-        make clean && make -j all MOREFLAGS="-Werror -DHUF_FORCE_DECOMPRESS_X2 -DZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG"
-        make clean && make check MOREFLAGS="-Werror -DHUF_FORCE_DECOMPRESS_X2 -DZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG"
-        make clean && make -j all MOREFLAGS="-Werror -DZSTD_NO_INLINE -DZSTD_STRIP_ERROR_STRINGS"
-        make clean && make check MOREFLAGS="-Werror -DZSTD_NO_INLINE -DZSTD_STRIP_ERROR_STRINGS"
-
-  dynamic-bmi2:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: dynamic bmi2 tests
-      run: |
-        make clean && make -j check MOREFLAGS="-O0 -Werror -mbmi2"
-        make clean && make -j check MOREFLAGS="-O0 -Werror -DDYNAMIC_BMI2=1"
-        make clean && make -j check MOREFLAGS="-O0 -Werror -DDYNAMIC_BMI2=1 -mbmi2"
-        make clean && make -j check MOREFLAGS="-O0 -Werror -DDYNAMIC_BMI2=0"
-        make clean && make -j check MOREFLAGS="-O0 -Werror -DDYNAMIC_BMI2=0 -mbmi2"
-
-  test-variants:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: make all variants & validate
-      run: |
-        make -j -C programs allVariants MOREFLAGS=-O0
-        ./tests/test-variants.sh
-
-
-  qemu-consistency:
-    name: QEMU ${{ matrix.name }}
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false  # 'false' means Don't stop matrix workflows even if some matrix failed.
-      matrix:
-        include: [
-          { name: ARM,      xcc_pkg: gcc-arm-linux-gnueabi,     xcc: arm-linux-gnueabi-gcc,     xemu_pkg: qemu-system-arm,    xemu: qemu-arm-static     },
-          { name: ARM64,    xcc_pkg: gcc-aarch64-linux-gnu,     xcc: aarch64-linux-gnu-gcc,     xemu_pkg: qemu-system-arm,    xemu: qemu-aarch64-static },
-          { name: PPC,      xcc_pkg: gcc-powerpc-linux-gnu,     xcc: powerpc-linux-gnu-gcc,     xemu_pkg: qemu-system-ppc,    xemu: qemu-ppc-static     },
-          { name: PPC64LE,  xcc_pkg: gcc-powerpc64le-linux-gnu, xcc: powerpc64le-linux-gnu-gcc, xemu_pkg: qemu-system-ppc,    xemu: qemu-ppc64le-static },
-          { name: S390X,    xcc_pkg: gcc-s390x-linux-gnu,       xcc: s390x-linux-gnu-gcc,       xemu_pkg: qemu-system-s390x,  xemu: qemu-s390x-static   },
-          { name: MIPS,     xcc_pkg: gcc-mips-linux-gnu,        xcc: mips-linux-gnu-gcc,        xemu_pkg: qemu-system-mips,   xemu: qemu-mips-static    },
-          { name: M68K,     xcc_pkg: gcc-m68k-linux-gnu,        xcc: m68k-linux-gnu-gcc,        xemu_pkg: qemu-system-m68k,   xemu: qemu-m68k-static    },
-        ]
-    env:                        # Set environment variables
-      XCC: ${{ matrix.xcc }}
-      XEMU: ${{ matrix.xemu }}
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: apt update & install
-      run: |
-        sudo apt-get update
-        sudo apt-get install gcc-multilib g++-multilib qemu-utils qemu-user-static
-        sudo apt-get install ${{ matrix.xcc_pkg }} ${{ matrix.xemu_pkg }}
-    - name: Environment info
-      run: |
-        echo && which $XCC
-        echo && $XCC --version
-        echo && $XCC -v  # Show built-in specs
-        echo && which $XEMU
-        echo && $XEMU --version
-    - name: ARM
-      if: ${{ matrix.name == 'ARM' }}
-      run: |
-        LDFLAGS="-static" CC=$XCC QEMU_SYS=$XEMU make clean check
-    - name: ARM64
-      if: ${{ matrix.name == 'ARM64' }}
-      run: |
-        LDFLAGS="-static" CC=$XCC QEMU_SYS=$XEMU make clean check
-    - name: PPC
-      if: ${{ matrix.name == 'PPC' }}
-      run: |
-        LDFLAGS="-static" CC=$XCC QEMU_SYS=$XEMU make clean check
-    - name: PPC64LE
-      if: ${{ matrix.name == 'PPC64LE' }}
-      run: |
-        LDFLAGS="-static" CC=$XCC QEMU_SYS=$XEMU make clean check
-    - name: S390X
-      if: ${{ matrix.name == 'S390X' }}
-      run: |
-        LDFLAGS="-static" CC=$XCC QEMU_SYS=$XEMU make clean check
-    - name: MIPS
-      if: ${{ matrix.name == 'MIPS' }}
-      run: |
-        LDFLAGS="-static" CC=$XCC QEMU_SYS=$XEMU make clean check
-    - name: M68K
-      if: ${{ matrix.name == 'M68K' }}
-      run: |
-        LDFLAGS="-static" CC=$XCC QEMU_SYS=$XEMU make clean check
-
-  mingw-short-test:
-    runs-on: windows-2019
-    strategy:
-      fail-fast: false
-      matrix:
-        include: [
-          { compiler: gcc, platform: x64, script: "CFLAGS=-Werror make -j allzstd DEBUGLEVEL=2"},
-          { compiler: gcc, platform: x86, script: "CFLAGS=-Werror make -j allzstd"},
-          { compiler: clang, platform: x64, script: "CFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make -j allzstd V=1"},
-        ]
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: Mingw short test
-      run: |
-        ECHO "Building ${{matrix.compiler}} ${{matrix.platform}}"
-        $env:PATH_ORIGINAL = $env:PATH
-        $env:PATH_MINGW32 = "C:\msys64\mingw32\bin"
-        $env:PATH_MINGW64 = "C:\msys64\mingw64\bin"
-        COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw32\bin\make.exe
-        COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw64\bin\make.exe
-        IF ("${{matrix.platform}}" -eq "x64")
-        {
-            $env:PATH = $env:PATH_MINGW64 + ";" + $env:PATH_ORIGINAL
-        }
-        ELSEIF ("${{matrix.platform}}" -eq "x86")
-        {
-            $env:PATH = $env:PATH_MINGW32 + ";" + $env:PATH_ORIGINAL
-        }
-        make -v
-        sh -c "${{matrix.compiler}} -v"
-        $env:CC = "${{matrix.compiler}}"
-        sh -c "${{matrix.script}}"
-        ECHO "Testing ${{matrix.compiler}} ${{matrix.platform}}"
-        make clean
-        make check
-
-
-  visual-runtime-tests:
-    runs-on: windows-2019
-    strategy:
-      matrix:
-        platform: [x64, Win32]
-        configuration: [Release]
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@34cfbaee7f672c76950673338facd8a73f637506 # tag=v1.1.3
-    - name: Build and run tests
-      working-directory: ${{env.GITHUB_WORKSPACE}}
-      env:
-        ZSTD_BIN: ./zstd.exe
-        DATAGEN_BIN: ./datagen.exe
-      # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
-      run: |
-        msbuild "build\VS2010\zstd.sln" /m /verbosity:minimal /property:PlatformToolset=v142 /t:Clean,Build /p:Platform=${{matrix.platform}} /p:Configuration=${{matrix.configuration}}
-        COPY build\VS2010\bin\${{matrix.platform}}_${{matrix.configuration}}\*.exe tests\
-        CD tests
-        sh -e playTests.sh
-        DIR
-        .\fuzzer.exe -T2m
-
-  intel-cet-compatibility:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: Build Zstd
-      run: |
-        make -j zstd V=1
-        readelf -n zstd
-    - name: Get Intel SDE
-      run: |
-        curl -LO https://downloadmirror.intel.com/684899/sde-external-9.0.0-2021-11-07-lin.tar.xz
-        tar xJvf sde-external-9.0.0-2021-11-07-lin.tar.xz
-    - name: Configure Permissions
-      run: |
-        echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope
-    - name: Run Under SDE
-      run: |
-        sde-external-9.0.0-2021-11-07-lin/sde -cet -cet-raise 0 -cet-endbr-exe -cet-stderr -cet-abort -- ./zstd -b3
-
-  pkg-config:
-    runs-on: ubuntu-latest
-    container:
-      image: debian:testing
-    steps:
-      - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-      - name: Install dependencies
+      - uses: actions/checkout@v3
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: CLANG64
+          update: true
+          install: git mingw-w64-ucrt-x86_64-clang
+      - name: Mingw short test
         run: |
-          apt -y update
-          apt -y install --no-install-recommends gcc libc6-dev make pkg-config
-      - name: Build and install
-        run: make -C lib install
-      - name: Test pkg-config
-        run: |
-          cc -Wall -Wextra -Wpedantic -Werror -o simple examples/simple_compression.c $(pkg-config --cflags --libs libzstd)
-          ./simple LICENSE
-
-  versions-compatibility:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: Versions Compatibility Test
-      run: |
-        make -C tests versionsTest
-
-  clangbuild:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: make clangbuild
-      run: |
-        make clangbuild
-
-
-# For reference : icc tests
-# icc tests are currently failing on Github Actions, likely to issues during installation stage
-# To be fixed later
-#
-#  icc:
-#    name: icc-check
-#    runs-on: ubuntu-latest
-#    steps:
-#    - name: install icc
-#      run: |
-#        export DEBIAN_FRONTEND=noninteractive
-#        sudo apt-get -qqq update
-#        sudo apt-get install -y wget build-essential pkg-config cmake ca-certificates gnupg
-#        sudo wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
-#        sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
-#        sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
-#        sudo apt-get update
-#        sudo apt-get install -y intel-basekit intel-hpckit
-#    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-#    - name: make check
-#      run: |
-#        make CC=/opt/intel/oneapi/compiler/latest/linux/bin/intel64/icc check
+          make -v
+          export $CC=clang
+          CFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make -j allzstd V=1
+
+#   visual-runtime-tests:
+#     runs-on: windows-2019
+#     strategy:
+#       matrix:
+#         platform: [x64, Win32]
+#         configuration: [Release]
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: Add MSBuild to PATH
+#       uses: microsoft/setup-msbuild@34cfbaee7f672c76950673338facd8a73f637506 # tag=v1.1.3
+#     - name: Build and run tests
+#       working-directory: ${{env.GITHUB_WORKSPACE}}
+#       env:
+#         ZSTD_BIN: ./zstd.exe
+#         DATAGEN_BIN: ./datagen.exe
+#       # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
+#       run: |
+#         msbuild "build\VS2010\zstd.sln" /m /verbosity:minimal /property:PlatformToolset=v142 /t:Clean,Build /p:Platform=${{matrix.platform}} /p:Configuration=${{matrix.configuration}}
+#         COPY build\VS2010\bin\${{matrix.platform}}_${{matrix.configuration}}\*.exe tests\
+#         CD tests
+#         sh -e playTests.sh
+#         DIR
+#         .\fuzzer.exe -T2m
+
+#   intel-cet-compatibility:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: Build Zstd
+#       run: |
+#         make -j zstd V=1
+#         readelf -n zstd
+#     - name: Get Intel SDE
+#       run: |
+#         curl -LO https://downloadmirror.intel.com/684899/sde-external-9.0.0-2021-11-07-lin.tar.xz
+#         tar xJvf sde-external-9.0.0-2021-11-07-lin.tar.xz
+#     - name: Configure Permissions
+#       run: |
+#         echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope
+#     - name: Run Under SDE
+#       run: |
+#         sde-external-9.0.0-2021-11-07-lin/sde -cet -cet-raise 0 -cet-endbr-exe -cet-stderr -cet-abort -- ./zstd -b3
+
+#   pkg-config:
+#     runs-on: ubuntu-latest
+#     container:
+#       image: debian:testing
+#     steps:
+#       - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#       - name: Install dependencies
+#         run: |
+#           apt -y update
+#           apt -y install --no-install-recommends gcc libc6-dev make pkg-config
+#       - name: Build and install
+#         run: make -C lib install
+#       - name: Test pkg-config
+#         run: |
+#           cc -Wall -Wextra -Wpedantic -Werror -o simple examples/simple_compression.c $(pkg-config --cflags --libs libzstd)
+#           ./simple LICENSE
+
+#   versions-compatibility:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: Versions Compatibility Test
+#       run: |
+#         make -C tests versionsTest
+
+#   clangbuild:
+#     runs-on: ubuntu-latest
+#     steps:
+#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+#     - name: make clangbuild
+#       run: |
+#         make clangbuild
+
+
+# # For reference : icc tests
+# # icc tests are currently failing on Github Actions, likely to issues during installation stage
+# # To be fixed later
+# #
+# #  icc:
+# #    name: icc-check
+# #    runs-on: ubuntu-latest
+# #    steps:
+# #    - name: install icc
+# #      run: |
+# #        export DEBIAN_FRONTEND=noninteractive
+# #        sudo apt-get -qqq update
+# #        sudo apt-get install -y wget build-essential pkg-config cmake ca-certificates gnupg
+# #        sudo wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
+# #        sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
+# #        sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
+# #        sudo apt-get update
+# #        sudo apt-get install -y intel-basekit intel-hpckit
+# #    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+# #    - name: make check
+# #      run: |
+# #        make CC=/opt/intel/oneapi/compiler/latest/linux/bin/intel64/icc check

From a7f5f580bc84e184f661c821ff76c3f2684a5206 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 13:33:47 -0800
Subject: [PATCH 02/33] test commit 1

---
 .github/workflows/dev-short-tests.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index ddcb991c13a..31e6d523a59 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -429,11 +429,7 @@ jobs:
 #         make clean
 #         make check
 
-name: MSYS2
-on: [push, pull_request]
-
-jobs:
-  msys2-ucrt64:
+  mingw-clang:
     runs-on: windows-latest
     defaults:
       run:

From a5edfe6a4a512f7bf274ee73aaa308c061635097 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 13:38:09 -0800
Subject: [PATCH 03/33] test commit 3

---
 .github/workflows/dev-short-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 31e6d523a59..9ed778a751f 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -440,7 +440,7 @@ jobs:
         with:
           msystem: CLANG64
           update: true
-          install: git mingw-w64-ucrt-x86_64-clang
+          install: make mingw-w64-ucrt-x86_64-clang
       - name: Mingw short test
         run: |
           make -v

From d915b6c489325ae74a93f733b8256e79e180834b Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 13:41:32 -0800
Subject: [PATCH 04/33] test commit 3

---
 .github/workflows/dev-short-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 9ed778a751f..fcc6b7c1f34 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -444,8 +444,8 @@ jobs:
       - name: Mingw short test
         run: |
           make -v
-          export $CC=clang
-          CFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make -j allzstd V=1
+          clang -v
+          CC=clang CFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make -j allzstd V=1
 
 #   visual-runtime-tests:
 #     runs-on: windows-2019

From ea5db597218d55b2b827a9202e249ee52e071ab8 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 13:51:55 -0800
Subject: [PATCH 05/33] test5

---
 .github/workflows/dev-short-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index fcc6b7c1f34..3b5b5775f17 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -440,7 +440,7 @@ jobs:
         with:
           msystem: CLANG64
           update: true
-          install: make mingw-w64-ucrt-x86_64-clang
+          install: make clang
       - name: Mingw short test
         run: |
           make -v

From e0fcd11e468f802f96d6a30fa6fcea0e66a16395 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 14:00:08 -0800
Subject: [PATCH 06/33] test6

---
 .github/workflows/dev-short-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 3b5b5775f17..523c30e3555 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -438,9 +438,9 @@ jobs:
       - uses: actions/checkout@v3
       - uses: msys2/setup-msys2@v2
         with:
-          msystem: CLANG64
+          msystem: mingw64
           update: true
-          install: make clang
+          install: make mingw-w64-clang
       - name: Mingw short test
         run: |
           make -v

From 7e3378d5287d7884e25b953dbb0caaa68208ae15 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 14:03:19 -0800
Subject: [PATCH 07/33] test7

---
 .github/workflows/dev-short-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 523c30e3555..8c7b8dace60 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -440,7 +440,7 @@ jobs:
         with:
           msystem: mingw64
           update: true
-          install: make mingw-w64-clang
+          install: make clang
       - name: Mingw short test
         run: |
           make -v

From cc2b59e194be745764864144bc359e1130f88de5 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 14:07:09 -0800
Subject: [PATCH 08/33] test7

---
 .github/workflows/dev-short-tests.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 8c7b8dace60..4a915226c0f 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -438,12 +438,14 @@ jobs:
       - uses: actions/checkout@v3
       - uses: msys2/setup-msys2@v2
         with:
-          msystem: mingw64
+          msystem: clang64
           update: true
           install: make clang
       - name: Mingw short test
         run: |
           make -v
+          echo $MINGW_PREFIX
+          ls / || ls C:\
           clang -v
           CC=clang CFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make -j allzstd V=1
 

From 3fc30c5c414344170fb1502be48d3c7f716b7a40 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 14:13:50 -0800
Subject: [PATCH 09/33] test8

---
 .github/workflows/dev-short-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 4a915226c0f..f3120db7d30 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -445,7 +445,7 @@ jobs:
         run: |
           make -v
           echo $MINGW_PREFIX
-          ls / || ls C:\
+          ls /clang64/bin
           clang -v
           CC=clang CFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make -j allzstd V=1
 

From e4c0a402e9077416fd9f8099cb5221238b47df6d Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 14:17:36 -0800
Subject: [PATCH 10/33] test9

---
 .github/workflows/dev-short-tests.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index f3120db7d30..b1aeee54b00 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -444,8 +444,7 @@ jobs:
       - name: Mingw short test
         run: |
           make -v
-          echo $MINGW_PREFIX
-          ls /clang64/bin
+          export PATH="$MINGW_PREFIX/bin:$PATH"
           clang -v
           CC=clang CFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make -j allzstd V=1
 

From 0c85c07de839ce8c9b4a4dd4b9a428a3e663b6db Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 14:20:07 -0800
Subject: [PATCH 11/33] test9

---
 .github/workflows/dev-short-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index b1aeee54b00..d5c61b142d7 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -438,7 +438,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: msys2/setup-msys2@v2
         with:
-          msystem: clang64
+          msystem: mingw64
           update: true
           install: make clang
       - name: Mingw short test

From 563e44b156c2ab688bd00a5ebecb4ca701c1f5a7 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 14:37:42 -0800
Subject: [PATCH 12/33] test10

---
 .github/workflows/dev-short-tests.yml | 77 ++++++++++++++-------------
 1 file changed, 40 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index d5c61b142d7..2de2ee5741f 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -393,41 +393,44 @@ jobs:
 #       run: |
 #         LDFLAGS="-static" CC=$XCC QEMU_SYS=$XEMU make clean check
 
-#   mingw-short-test:
-#     runs-on: windows-2019
-#     strategy:
-#       fail-fast: false
-#       matrix:
-#         include: [
-#           { compiler: gcc, platform: x64, script: "CFLAGS=-Werror make -j allzstd DEBUGLEVEL=2"},
-#           { compiler: gcc, platform: x86, script: "CFLAGS=-Werror make -j allzstd"},
-#           { compiler: clang, platform: x64, script: "CFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make -j allzstd V=1"},
-#         ]
-#     steps:
-#     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-#     - name: Mingw short test
-#       run: |
-#         ECHO "Building ${{matrix.compiler}} ${{matrix.platform}}"
-#         $env:PATH_ORIGINAL = $env:PATH
-#         $env:PATH_MINGW32 = "C:\msys64\mingw32\bin"
-#         $env:PATH_MINGW64 = "C:\msys64\mingw64\bin"
-#         COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw32\bin\make.exe
-#         COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw64\bin\make.exe
-#         IF ("${{matrix.platform}}" -eq "x64")
-#         {
-#             $env:PATH = $env:PATH_MINGW64 + ";" + $env:PATH_ORIGINAL
-#         }
-#         ELSEIF ("${{matrix.platform}}" -eq "x86")
-#         {
-#             $env:PATH = $env:PATH_MINGW32 + ";" + $env:PATH_ORIGINAL
-#         }
-#         make -v
-#         sh -c "${{matrix.compiler}} -v"
-#         $env:CC = "${{matrix.compiler}}"
-#         sh -c "${{matrix.script}}"
-#         ECHO "Testing ${{matrix.compiler}} ${{matrix.platform}}"
-#         make clean
-#         make check
+  mingw-short-test:
+    runs-on: windows-2019
+    strategy:
+      fail-fast: false
+      matrix:
+        include: [
+          { compiler: gcc, platform: x64, script: "CFLAGS=-Werror make -j allzstd DEBUGLEVEL=2"},
+          { compiler: gcc, platform: x86, script: "CFLAGS=-Werror make -j allzstd"},
+          { compiler: clang, platform: x64, script: "CFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make -j allzstd V=1"},
+        ]
+    steps:
+    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+    - name: Mingw short test
+      run: |
+        ECHO "Building ${{matrix.compiler}} ${{matrix.platform}}"
+        $env:PATH_ORIGINAL = $env:PATH
+        $env:PATH_MINGW32 = "C:\msys64\mingw32\bin"
+        $env:PATH_MINGW64 = "C:\msys64\mingw64\bin"
+        $env:PATH = "C:\msys64\usr\bin;$env:PATH"
+        where msys2
+        msys2 -c "'pacman' '--noconfirm' '-S' '--needed' '--overwrite' '*' 'make' 'clang'"
+        COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw32\bin\make.exe
+        COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw64\bin\make.exe
+        IF ("${{matrix.platform}}" -eq "x64")
+        {
+            $env:PATH = $env:PATH_MINGW64 + ";" + $env:PATH_ORIGINAL
+        }
+        ELSEIF ("${{matrix.platform}}" -eq "x86")
+        {
+            $env:PATH = $env:PATH_MINGW32 + ";" + $env:PATH_ORIGINAL
+        }
+        make -v
+        sh -c "${{matrix.compiler}} -v"
+        $env:CC = "${{matrix.compiler}}"
+        sh -c "${{matrix.script}}"
+        ECHO "Testing ${{matrix.compiler}} ${{matrix.platform}}"
+        make clean
+        make check
 
   mingw-clang:
     runs-on: windows-latest
@@ -438,13 +441,13 @@ jobs:
       - uses: actions/checkout@v3
       - uses: msys2/setup-msys2@v2
         with:
-          msystem: mingw64
+          msystem: clang64
           update: true
           install: make clang
       - name: Mingw short test
         run: |
           make -v
-          export PATH="$MINGW_PREFIX/bin:$PATH"
+          gcc -v
           clang -v
           CC=clang CFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make -j allzstd V=1
 

From 52fa4e4cd30e03dae02ae27f0563678cb31e96c6 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 14:42:40 -0800
Subject: [PATCH 13/33] test10

---
 .github/workflows/dev-short-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 2de2ee5741f..0b3265c8056 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -412,8 +412,8 @@ jobs:
         $env:PATH_MINGW32 = "C:\msys64\mingw32\bin"
         $env:PATH_MINGW64 = "C:\msys64\mingw64\bin"
         $env:PATH = "C:\msys64\usr\bin;$env:PATH"
-        where msys2
-        msys2 -c "'pacman' '--noconfirm' '-S' '--needed' '--overwrite' '*' 'make' 'clang'"
+        where pacman
+        C:\msys64\usr\bin\pacman '--noconfirm' '-S' '--needed' '--overwrite' '*' 'make' 'clang'
         COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw32\bin\make.exe
         COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw64\bin\make.exe
         IF ("${{matrix.platform}}" -eq "x64")

From e163e8fc66e82ab3e58a099ce15d4bd421696176 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 14:52:21 -0800
Subject: [PATCH 14/33] test11

---
 .github/workflows/dev-short-tests.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 0b3265c8056..d3ed676356a 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -401,19 +401,21 @@ jobs:
         include: [
           { compiler: gcc, platform: x64, script: "CFLAGS=-Werror make -j allzstd DEBUGLEVEL=2"},
           { compiler: gcc, platform: x86, script: "CFLAGS=-Werror make -j allzstd"},
-          { compiler: clang, platform: x64, script: "CFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make -j allzstd V=1"},
+          { compiler: clang, platform: x64, script: "CFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make -j allztd V=1"},
         ]
     steps:
     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
     - name: Mingw short test
       run: |
         ECHO "Building ${{matrix.compiler}} ${{matrix.platform}}"
+        $PSNativeCommandUseErrorActionPreference = $true
+        $ErrorActionPreference = 'Stop'
         $env:PATH_ORIGINAL = $env:PATH
         $env:PATH_MINGW32 = "C:\msys64\mingw32\bin"
         $env:PATH_MINGW64 = "C:\msys64\mingw64\bin"
         $env:PATH = "C:\msys64\usr\bin;$env:PATH"
         where pacman
-        C:\msys64\usr\bin\pacman '--noconfirm' '-S' '--needed' '--overwrite' '*' 'make' 'clang'
+        C:\msys64\usr\bin\pacman '--noconfirm' '-S' '--needed' '--overwrite' 'make'
         COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw32\bin\make.exe
         COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw64\bin\make.exe
         IF ("${{matrix.platform}}" -eq "x64")

From f89df09d177794d0bbec52f45a1e56f9243aeba1 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 14:57:07 -0800
Subject: [PATCH 15/33] test12

---
 .github/workflows/dev-short-tests.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index d3ed676356a..298be4bb61d 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -401,7 +401,7 @@ jobs:
         include: [
           { compiler: gcc, platform: x64, script: "CFLAGS=-Werror make -j allzstd DEBUGLEVEL=2"},
           { compiler: gcc, platform: x86, script: "CFLAGS=-Werror make -j allzstd"},
-          { compiler: clang, platform: x64, script: "CFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make -j allztd V=1"},
+          { compiler: clang, platform: x64, script: "CFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make -j allzstd V=1"},
         ]
     steps:
     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
@@ -415,9 +415,9 @@ jobs:
         $env:PATH_MINGW64 = "C:\msys64\mingw64\bin"
         $env:PATH = "C:\msys64\usr\bin;$env:PATH"
         where pacman
-        C:\msys64\usr\bin\pacman '--noconfirm' '-S' '--needed' '--overwrite' 'make'
-        COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw32\bin\make.exe
-        COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw64\bin\make.exe
+        #C:\msys64\usr\bin\pacman '--noconfirm' '-S' '--needed' '--overwrite' 'make'
+        #COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw32\bin\make.exe
+        #COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw64\bin\make.exe
         IF ("${{matrix.platform}}" -eq "x64")
         {
             $env:PATH = $env:PATH_MINGW64 + ";" + $env:PATH_ORIGINAL

From 90413bd966fb39d4b506a59114985953ecc8f883 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 14:59:10 -0800
Subject: [PATCH 16/33] test12

---
 .github/workflows/dev-short-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 298be4bb61d..13438bf4908 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -394,7 +394,7 @@ jobs:
 #         LDFLAGS="-static" CC=$XCC QEMU_SYS=$XEMU make clean check
 
   mingw-short-test:
-    runs-on: windows-2019
+    runs-on: windows-latest
     strategy:
       fail-fast: false
       matrix:

From fca7396167e4b841756006d42160ac2e593db62e Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 15:01:30 -0800
Subject: [PATCH 17/33] test12

---
 .github/workflows/dev-short-tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 13438bf4908..ada8bdb184b 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -415,9 +415,9 @@ jobs:
         $env:PATH_MINGW64 = "C:\msys64\mingw64\bin"
         $env:PATH = "C:\msys64\usr\bin;$env:PATH"
         where pacman
-        #C:\msys64\usr\bin\pacman '--noconfirm' '-S' '--needed' '--overwrite' 'make'
-        #COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw32\bin\make.exe
-        #COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw64\bin\make.exe
+        C:\msys64\usr\bin\pacman '--noconfirm' '-S' '--needed' '--overwrite' 'make'
+        COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw32\bin\make.exe
+        COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw64\bin\make.exe
         IF ("${{matrix.platform}}" -eq "x64")
         {
             $env:PATH = $env:PATH_MINGW64 + ";" + $env:PATH_ORIGINAL

From b3c7389aa7d0a379babc3317a452cae037d0cdd4 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 15:07:15 -0800
Subject: [PATCH 18/33] test13

---
 .github/workflows/dev-short-tests.yml | 111 ++++++++++++++------------
 1 file changed, 58 insertions(+), 53 deletions(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index ada8bdb184b..148e443a439 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -393,65 +393,70 @@ jobs:
 #       run: |
 #         LDFLAGS="-static" CC=$XCC QEMU_SYS=$XEMU make clean check
 
-  mingw-short-test:
-    runs-on: windows-latest
+  # mingw-short-test:
+  #   runs-on: windows-latest
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       include: [
+  #         { compiler: gcc, platform: x64, script: "CFLAGS=-Werror make -j allzstd DEBUGLEVEL=2"},
+  #         { compiler: gcc, platform: x86, script: "CFLAGS=-Werror make -j allzstd"},
+  #         { compiler: clang, platform: x64, script: "CFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make -j allzstd V=1"},
+  #       ]
+  #   steps:
+  #   - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
+  #   - name: Mingw short test
+  #     run: |
+  #       ECHO "Building ${{matrix.compiler}} ${{matrix.platform}}"
+  #       $PSNativeCommandUseErrorActionPreference = $true
+  #       $ErrorActionPreference = 'Stop'
+  #       $env:PATH_ORIGINAL = $env:PATH
+  #       $env:PATH_MINGW32 = "C:\msys64\mingw32\bin"
+  #       $env:PATH_MINGW64 = "C:\msys64\mingw64\bin"
+  #       $env:PATH = "C:\msys64\usr\bin;$env:PATH"
+  #       where pacman
+  #       C:\msys64\usr\bin\pacman '--noconfirm' '-S' '--needed' '--overwrite' 'make'
+  #       COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw32\bin\make.exe
+  #       COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw64\bin\make.exe
+  #       IF ("${{matrix.platform}}" -eq "x64")
+  #       {
+  #           $env:PATH = $env:PATH_MINGW64 + ";" + $env:PATH_ORIGINAL
+  #       }
+  #       ELSEIF ("${{matrix.platform}}" -eq "x86")
+  #       {
+  #           $env:PATH = $env:PATH_MINGW32 + ";" + $env:PATH_ORIGINAL
+  #       }
+  #       make -v
+  #       sh -c "${{matrix.compiler}} -v"
+  #       $env:CC = "${{matrix.compiler}}"
+  #       sh -c "${{matrix.script}}"
+  #       ECHO "Testing ${{matrix.compiler}} ${{matrix.platform}}"
+  #       make clean
+  #       make check
+
+  windows:
+    runs-on: windows-2019
     strategy:
-      fail-fast: false
       matrix:
-        include: [
-          { compiler: gcc, platform: x64, script: "CFLAGS=-Werror make -j allzstd DEBUGLEVEL=2"},
-          { compiler: gcc, platform: x86, script: "CFLAGS=-Werror make -j allzstd"},
-          { compiler: clang, platform: x64, script: "CFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make -j allzstd V=1"},
-        ]
-    steps:
-    - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # tag=v3
-    - name: Mingw short test
-      run: |
-        ECHO "Building ${{matrix.compiler}} ${{matrix.platform}}"
-        $PSNativeCommandUseErrorActionPreference = $true
-        $ErrorActionPreference = 'Stop'
-        $env:PATH_ORIGINAL = $env:PATH
-        $env:PATH_MINGW32 = "C:\msys64\mingw32\bin"
-        $env:PATH_MINGW64 = "C:\msys64\mingw64\bin"
-        $env:PATH = "C:\msys64\usr\bin;$env:PATH"
-        where pacman
-        C:\msys64\usr\bin\pacman '--noconfirm' '-S' '--needed' '--overwrite' 'make'
-        COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw32\bin\make.exe
-        COPY C:\msys64\usr\bin\make.exe C:\msys64\mingw64\bin\make.exe
-        IF ("${{matrix.platform}}" -eq "x64")
-        {
-            $env:PATH = $env:PATH_MINGW64 + ";" + $env:PATH_ORIGINAL
-        }
-        ELSEIF ("${{matrix.platform}}" -eq "x86")
-        {
-            $env:PATH = $env:PATH_MINGW32 + ";" + $env:PATH_ORIGINAL
-        }
-        make -v
-        sh -c "${{matrix.compiler}} -v"
-        $env:CC = "${{matrix.compiler}}"
-        sh -c "${{matrix.script}}"
-        ECHO "Testing ${{matrix.compiler}} ${{matrix.platform}}"
-        make clean
-        make check
-
-  mingw-clang:
-    runs-on: windows-latest
+        compiler: [gcc, clang]
+        msystem: [MINGW32, MINGW64]
     defaults:
       run:
         shell: msys2 {0}
     steps:
-      - uses: actions/checkout@v3
-      - uses: msys2/setup-msys2@v2
-        with:
-          msystem: clang64
-          update: true
-          install: make clang
-      - name: Mingw short test
-        run: |
-          make -v
-          gcc -v
-          clang -v
-          CC=clang CFLAGS='--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion' make -j allzstd V=1
+    - uses: actions/checkout@v2
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.msystem }}
+        install: make
+    - run: pacman --noconfirm -S gcc
+      if: ${{ matrix.compiler == 'gcc' }}
+    - run: pacman --noconfirm -S mingw-w64-x86_64-clang
+      if: ${{ (matrix.msystem == 'MINGW64') && (matrix.compiler == 'clang') }}
+    - run: pacman --noconfirm -S mingw-w64-i686-clang
+      if: ${{ (matrix.msystem == 'MINGW32') && (matrix.compiler == 'clang') }}
+    - run: ${{ matrix.compiler }} --version
+    - run: make CC=${{ matrix.compiler }}
 
 #   visual-runtime-tests:
 #     runs-on: windows-2019

From 244c68a72f6a5f598553e0b2333109e3cb5dff0e Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 15:10:44 -0800
Subject: [PATCH 19/33] test14

---
 .github/workflows/dev-short-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 148e443a439..fe9e3c6618a 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -435,7 +435,7 @@ jobs:
   #       make check
 
   windows:
-    runs-on: windows-2019
+    runs-on: windows-latest
     strategy:
       matrix:
         compiler: [gcc, clang]

From 16fde898cb1224021f3ce1b1698479ce739c5cd5 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 15:16:32 -0800
Subject: [PATCH 20/33] test15

---
 .github/workflows/dev-short-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index fe9e3c6618a..76c94e3383e 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -456,7 +456,7 @@ jobs:
     - run: pacman --noconfirm -S mingw-w64-i686-clang
       if: ${{ (matrix.msystem == 'MINGW32') && (matrix.compiler == 'clang') }}
     - run: ${{ matrix.compiler }} --version
-    - run: make CC=${{ matrix.compiler }}
+    - run: make CC=${{ matrix.compiler }} CFLAGS="-Werror -Wconversion -Wno-sign-conversion"
 
 #   visual-runtime-tests:
 #     runs-on: windows-2019

From 45895845ef32d72f4311def174baf5790d218bd9 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 15:20:52 -0800
Subject: [PATCH 21/33] test15

---
 .github/workflows/dev-short-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 76c94e3383e..c277c7c3b39 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -456,7 +456,7 @@ jobs:
     - run: pacman --noconfirm -S mingw-w64-i686-clang
       if: ${{ (matrix.msystem == 'MINGW32') && (matrix.compiler == 'clang') }}
     - run: ${{ matrix.compiler }} --version
-    - run: make CC=${{ matrix.compiler }} CFLAGS="-Werror -Wconversion -Wno-sign-conversion"
+    - run: make CC=${{ matrix.compiler }} CFLAGS="-Werror"
 
 #   visual-runtime-tests:
 #     runs-on: windows-2019

From 6e13947d1ce5a04fd9f95a07491b32df242efd4d Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 15:27:47 -0800
Subject: [PATCH 22/33] test15

---
 .github/workflows/dev-short-tests.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index c277c7c3b39..0c70ce7bde0 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -438,8 +438,11 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        compiler: [gcc, clang]
-        msystem: [MINGW32, MINGW64]
+        include: [
+          { compiler: gcc, msystem: MINGW32, cflags: "-Werror"},
+          { compiler: gcc, msystem: MINGW64, cflags: "-Werror"},
+          { compiler: clang, msystem: MINGW64, cflags: "--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion"},
+        ]
     defaults:
       run:
         shell: msys2 {0}
@@ -456,7 +459,7 @@ jobs:
     - run: pacman --noconfirm -S mingw-w64-i686-clang
       if: ${{ (matrix.msystem == 'MINGW32') && (matrix.compiler == 'clang') }}
     - run: ${{ matrix.compiler }} --version
-    - run: make CC=${{ matrix.compiler }} CFLAGS="-Werror"
+    - run: make CC=${{ matrix.compiler }} CFLAGS="${{ matrix.cflags }}"
 
 #   visual-runtime-tests:
 #     runs-on: windows-2019

From b4fc2de7d0a62cc01e2ccf114696bd16aa0e8583 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 15:36:02 -0800
Subject: [PATCH 23/33] test16

---
 .github/workflows/dev-short-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 0c70ce7bde0..0413f61bcdc 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -459,7 +459,7 @@ jobs:
     - run: pacman --noconfirm -S mingw-w64-i686-clang
       if: ${{ (matrix.msystem == 'MINGW32') && (matrix.compiler == 'clang') }}
     - run: ${{ matrix.compiler }} --version
-    - run: make CC=${{ matrix.compiler }} CFLAGS="${{ matrix.cflags }}"
+    - run: CFLAGS="${{ matrix.cflags }}" CC=${{ matrix.compiler }} make -j allzstd
 
 #   visual-runtime-tests:
 #     runs-on: windows-2019

From fa05936880e7471a6aada91ba639840a241a896a Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 15:44:59 -0800
Subject: [PATCH 24/33] test17

---
 .github/workflows/dev-short-tests.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 0413f61bcdc..a4bcf95d464 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -459,7 +459,12 @@ jobs:
     - run: pacman --noconfirm -S mingw-w64-i686-clang
       if: ${{ (matrix.msystem == 'MINGW32') && (matrix.compiler == 'clang') }}
     - run: ${{ matrix.compiler }} --version
+    - run: export CC=${{ matrix.compiler }}
     - run: CFLAGS="${{ matrix.cflags }}" CC=${{ matrix.compiler }} make -j allzstd
+    - run: |
+        echo "Testing ${{matrix.compiler}} ${{matrix.platform}}"
+        make clean
+        make check
 
 #   visual-runtime-tests:
 #     runs-on: windows-2019

From 5596228a1a0c1d01a5e07ab816f45cee30a9de52 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 15:51:56 -0800
Subject: [PATCH 25/33] test18

---
 .github/workflows/dev-short-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index a4bcf95d464..cc431bf4c33 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -451,7 +451,7 @@ jobs:
     - uses: msys2/setup-msys2@v2
       with:
         msystem: ${{ matrix.msystem }}
-        install: make
+        install: make diff
     - run: pacman --noconfirm -S gcc
       if: ${{ matrix.compiler == 'gcc' }}
     - run: pacman --noconfirm -S mingw-w64-x86_64-clang
@@ -462,7 +462,7 @@ jobs:
     - run: export CC=${{ matrix.compiler }}
     - run: CFLAGS="${{ matrix.cflags }}" CC=${{ matrix.compiler }} make -j allzstd
     - run: |
-        echo "Testing ${{matrix.compiler}} ${{matrix.platform}}"
+        echo "Testing ${{matrix.compiler}} ${{matrix.msystem}}"
         make clean
         make check
 

From 05916e09ae202cab0507cf39e714f69fa2a85ab2 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 15:54:55 -0800
Subject: [PATCH 26/33] test19

---
 .github/workflows/dev-short-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index cc431bf4c33..43f3fbf9f3b 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -451,7 +451,7 @@ jobs:
     - uses: msys2/setup-msys2@v2
       with:
         msystem: ${{ matrix.msystem }}
-        install: make diff
+        install: make mingw-w64-diffutils
     - run: pacman --noconfirm -S gcc
       if: ${{ matrix.compiler == 'gcc' }}
     - run: pacman --noconfirm -S mingw-w64-x86_64-clang

From c48a8f46954255c4c6a3dcbcefadc367daed9f03 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 15:58:55 -0800
Subject: [PATCH 27/33] test20

---
 .github/workflows/dev-short-tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 43f3fbf9f3b..933eb4232b4 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -452,6 +452,7 @@ jobs:
       with:
         msystem: ${{ matrix.msystem }}
         install: make mingw-w64-diffutils
+        update: true
     - run: pacman --noconfirm -S gcc
       if: ${{ matrix.compiler == 'gcc' }}
     - run: pacman --noconfirm -S mingw-w64-x86_64-clang

From 556d2b804d7a5d4ae17b897556d4421eed514a99 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 16:22:23 -0800
Subject: [PATCH 28/33] test21

---
 .github/workflows/dev-short-tests.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 933eb4232b4..6573c0fd305 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -453,6 +453,8 @@ jobs:
         msystem: ${{ matrix.msystem }}
         install: make mingw-w64-diffutils
         update: true
+    - run: choco install diffutils && which diff
+      shell: bash
     - run: pacman --noconfirm -S gcc
       if: ${{ matrix.compiler == 'gcc' }}
     - run: pacman --noconfirm -S mingw-w64-x86_64-clang

From 3c3ee62244e1b6e2a170b4a22a52f18a6f3cca33 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 16:24:32 -0800
Subject: [PATCH 29/33] test22

---
 .github/workflows/dev-short-tests.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 6573c0fd305..2c8a1d7971b 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -451,10 +451,8 @@ jobs:
     - uses: msys2/setup-msys2@v2
       with:
         msystem: ${{ matrix.msystem }}
-        install: make mingw-w64-diffutils
+        install: make diffutils
         update: true
-    - run: choco install diffutils && which diff
-      shell: bash
     - run: pacman --noconfirm -S gcc
       if: ${{ matrix.compiler == 'gcc' }}
     - run: pacman --noconfirm -S mingw-w64-x86_64-clang

From a9258c34eec8504703b3b36d83cfee82540c3b9f Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 16:35:54 -0800
Subject: [PATCH 30/33] test22

---
 .github/workflows/dev-short-tests.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 2c8a1d7971b..0293a73735b 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -435,7 +435,7 @@ jobs:
   #       make check
 
   windows:
-    runs-on: windows-latest
+    runs-on: windows-2019 # @nocommit
     strategy:
       matrix:
         include: [
@@ -453,16 +453,17 @@ jobs:
         msystem: ${{ matrix.msystem }}
         install: make diffutils
         update: true
+    # Based on https://ariya.io/2020/07/on-github-actions-with-msys2
     - run: pacman --noconfirm -S gcc
       if: ${{ matrix.compiler == 'gcc' }}
     - run: pacman --noconfirm -S mingw-w64-x86_64-clang
       if: ${{ (matrix.msystem == 'MINGW64') && (matrix.compiler == 'clang') }}
     - run: pacman --noconfirm -S mingw-w64-i686-clang
       if: ${{ (matrix.msystem == 'MINGW32') && (matrix.compiler == 'clang') }}
-    - run: ${{ matrix.compiler }} --version
-    - run: export CC=${{ matrix.compiler }}
-    - run: CFLAGS="${{ matrix.cflags }}" CC=${{ matrix.compiler }} make -j allzstd
     - run: |
+        ${{ matrix.compiler }} --version
+        export CC=${{ matrix.compiler }}
+        CFLAGS="${{ matrix.cflags }}" CC=${{ matrix.compiler }} make -j allzstd
         echo "Testing ${{matrix.compiler}} ${{matrix.msystem}}"
         make clean
         make check

From 9cc00710d53d3541a8201b447c93b4a5ba8b3619 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 17:01:42 -0800
Subject: [PATCH 31/33] test24

---
 .github/workflows/dev-short-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 0293a73735b..49d5b951ea2 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -435,7 +435,7 @@ jobs:
   #       make check
 
   windows:
-    runs-on: windows-2019 # @nocommit
+    runs-on: windows-latest
     strategy:
       matrix:
         include: [

From 8f9240d6533685d06c917d0cb3b402ae7f225cb5 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 17:03:41 -0800
Subject: [PATCH 32/33] test25

---
 .github/workflows/dev-short-tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 49d5b951ea2..20ac71d3443 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -461,10 +461,10 @@ jobs:
     - run: pacman --noconfirm -S mingw-w64-i686-clang
       if: ${{ (matrix.msystem == 'MINGW32') && (matrix.compiler == 'clang') }}
     - run: |
-        ${{ matrix.compiler }} --version
         export CC=${{ matrix.compiler }}
-        CFLAGS="${{ matrix.cflags }}" CC=${{ matrix.compiler }} make -j allzstd
-        echo "Testing ${{matrix.compiler}} ${{matrix.msystem}}"
+        $CC --version
+        CFLAGS="${{ matrix.cflags }}" make -j allzstd
+        echo "Testing $CC ${{ matrix.msystem }}"
         make clean
         make check
 

From 3a962c6d65924890d463c8945b1200def96272d0 Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Tue, 27 Dec 2022 17:07:39 -0800
Subject: [PATCH 33/33] test26

---
 .github/workflows/dev-short-tests.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 20ac71d3443..b2e1b7a5742 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -454,13 +454,17 @@ jobs:
         install: make diffutils
         update: true
     # Based on https://ariya.io/2020/07/on-github-actions-with-msys2
-    - run: pacman --noconfirm -S gcc
+    - name: install mingw gcc
+      run: pacman --noconfirm -S gcc
       if: ${{ matrix.compiler == 'gcc' }}
-    - run: pacman --noconfirm -S mingw-w64-x86_64-clang
+    - name: install mingw clang x86_64
+      run: pacman --noconfirm -S mingw-w64-x86_64-clang
       if: ${{ (matrix.msystem == 'MINGW64') && (matrix.compiler == 'clang') }}
-    - run: pacman --noconfirm -S mingw-w64-i686-clang
+    - name: install mingw clang i686
+      run: pacman --noconfirm -S mingw-w64-i686-clang
       if: ${{ (matrix.msystem == 'MINGW32') && (matrix.compiler == 'clang') }}
-    - run: |
+    - name: run mingw tests
+      run: |
         export CC=${{ matrix.compiler }}
         $CC --version
         CFLAGS="${{ matrix.cflags }}" make -j allzstd