tmp

kit-ty-kate · Jan 2, 2024 · fd8b74b · fd8b74b
1 parent 02ac968
commit fd8b74b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci.ml b/.github/workflows/ci.ml
@@ -339,8 +339,8 @@ let main_build_job ~analyse_job ~cygwin_job ?section runner start_version ~oc ~w
     ++ build_cache OCaml platform "${{ matrix.ocamlv }}" host
     ++ run "Build" ["bash -exu .github/scripts/main/main.sh " ^ host]
     ++ not_on Windows (run "Test (basic)" ["bash -exu .github/scripts/main/test.sh"])
-    ++ only_on Windows (run ~cond:(Predicate(true, EndsWith("matrix.host", "-w64-mingw32"))) "Test static binary" ["ldd ./opam.exe | grep -F libstdc++-6.dll ; test $? = 1"])
-    ++ only_on Windows (run ~cond:(Predicate(false, EndsWith("matrix.host", "-w64-mingw32"))) "Test static binary" ["ldd ./opam.exe | grep -F libstdc++-6.dll"])
+    ++ only_on Windows (run ~cond:(Predicate(true, EndsWith("matrix.host", "-w64-mingw32"))) "Test static binary" ["ldd ./opam.exe"])
+    ++ only_on Windows (run ~cond:(Predicate(false, EndsWith("matrix.host", "-w64-mingw32"))) "Test static binary" ["ldd ./opam.exe"])
     ++ only_on Windows (run "Test (basic - Cygwin)" ~cond:(Predicate(true, EndsWith("matrix.host", "-pc-cygwin"))) ["bash -exu .github/scripts/main/test.sh"])
     ++ only_on Windows (run "Test (basic - native Windows)" ~env:[("OPAMROOT", {|D:\a\opam\opam\.opam|})] ~shell:"cmd" ~cond:(Predicate(false, EndsWith("matrix.host", "-pc-cygwin")))
          ({|set Path=D:\Cache\ocaml-local\bin;%Path%|} ::

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -206,10 +206,10 @@ jobs:
       run: bash -exu .github/scripts/main/main.sh ${{ matrix.host }}
     - name: Test static binary
       if: endsWith(matrix.host, '-w64-mingw32')
-      run: ldd ./opam.exe | grep -F libstdc++-6.dll ; test $? = 1
+      run: ldd ./opam.exe
     - name: Test static binary
       if: endsWith(matrix.host, '-w64-mingw32') == false
-      run: ldd ./opam.exe | grep -F libstdc++-6.dll
+      run: ldd ./opam.exe
     - name: Test (basic - Cygwin)
       if: endsWith(matrix.host, '-pc-cygwin')
       run: bash -exu .github/scripts/main/test.sh