diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 35be3ef6..64bd361e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,8 +21,8 @@ jobs: - name: Setup anew (or from cache) vcpkg (and does not build any package) uses: lukka/run-vcpkg@v11 env: - VCPKG_DEFAULT_TRIPLET: x64-windows-static - VCPKG_DEFAULT_HOST_TRIPLET: x64-windows-static + VCPKG_DEFAULT_TRIPLET: x64-mingw-static + VCPKG_DEFAULT_HOST_TRIPLET: x64-mingw-static with: runVcpkgInstall: true runVcpkgFormatString: '["install", "--clean-after-build"]' @@ -41,16 +41,13 @@ jobs: run: | echo "PKG_CONFIG_PATH=${GITHUB_WORKSPACE}\vcpkg_installed\\${VCPKG_DEFAULT_TRIPLET}\lib\pkgconfig" >> $GITHUB_ENV - - shell: cmd - run: tree /f /a D:\a\odiff\odiff\vcpkg_installed - - run: | choco install pkgconfiglite - shell: bash run: | - echo "LIBPNG_CFLAGS=-ID:/a/odiff/odiff/vcpkg_installed/x64-windows-static/include " >> $GITHUB_ENV - echo "LIBPNG_LIBS='-LD:/a/odiff/odiff/vcpkg_installed/x64-windows-static/lib -lspng_static -lzlib'" >> $GITHUB_ENV + echo "LIBPNG_CFLAGS=$(pkg-config --cflags libspng_static)" >> $GITHUB_ENV + echo "LIBPNG_LIBS=$(pkg-config --libs libspng_static)" >> $GITHUB_ENV echo "LIBTIFF_LIBS=$(pkg-config --libs libtiff-4)" >> $GITHUB_ENV echo "LIBTIFF_CFLAGS=$(pkg-config --cflags libtiff-4)" >> $GITHUB_ENV echo "LIBJPEG_CFLAGS=$(pkg-config --cflags libturbojpeg)" >> $GITHUB_ENV @@ -58,7 +55,9 @@ jobs: - uses: ocaml/setup-ocaml@v3 with: - ocaml-compiler: 4.14.0 + opam-repositories: "default:https://github.com/fdopen/opam-repository-mingw.git#opam2" + ocaml-compiler: "ocaml-variants.4.07.1+mingw64" + opam-disable-sandboxing: true dune-cache: true - name: Install deps & build