|
16 | 16 |
|
17 | 17 | - shell: bash
|
18 | 18 | run: rm -rf $(which pkg-config)
|
19 |
| - - uses: cygwin/cygwin-install-action@master |
20 |
| - with: |
21 |
| - packages: pkg-config |
| 19 | + |
| 20 | + - run: gcc --version |
22 | 21 |
|
23 | 22 | - uses: actions/setup-node@v4
|
24 | 23 | with:
|
@@ -48,40 +47,27 @@ jobs:
|
48 | 47 | run: |
|
49 | 48 | echo "PKG_CONFIG_PATH=${GITHUB_WORKSPACE}\vcpkg_installed\\${VCPKG_DEFAULT_TRIPLET}\lib\pkgconfig" >> $GITHUB_ENV
|
50 | 49 |
|
51 |
| - # - run: | |
52 |
| - # choco install pkgconfiglite |
53 |
| - - run: PKG_CONFIG_PATH=${GITHUB_WORKSPACE}/vcpkg_installed/${VCPKG_DEFAULT_TRIPLET}/lib/pkgconfig pkg-config --cflags --libs libspngstatic |
54 |
| - |
55 |
| - # - run: git config --global core.autocrlf input |
56 |
| - # - uses: cygwin/cygwin-install-action@master |
57 |
| - |
58 |
| - # - shell: bash |
59 |
| - # run: | |
60 |
| - # echo "LIBPNG_CFLAGS=lol" >> $GITHUB_ENV |
61 |
| - # echo "LIBPNG_LIBS=lol" >> $GITHUB_ENV |
62 |
| - # echo "LIBTIFF_LIBS=lol" >> $GITHUB_ENV |
63 |
| - # echo "LIBTIFF_CFLAGS=lol" >> $GITHUB_ENV |
64 |
| - # echo "LIBJPEG_CFLAGS=lol" >> $GITHUB_ENV |
65 |
| - # echo "LIBJPEG_LIBS=lol" >> $GITHUB_ENV |
66 |
| - # |
67 |
| - # # curl -L -o opam64.tar.xz https://github.com/fdopen/opam-repository-mingw/releases/download/0.0.0.2/opam64.tar.xz |
68 |
| - # # tar -xf opam64.tar.xz |
69 |
| - # bash opam64/install.sh |
| 50 | + - run: | |
| 51 | + choco install pkgconfiglite |
| 52 | +
|
| 53 | + - shell: bash |
| 54 | + run: | |
| 55 | + echo "LIBPNG_CFLAGS=$(pkg-config --cflags libspng_static)" >> $GITHUB_ENV |
| 56 | + echo "LIBPNG_LIBS=$(pkg-config --libs libspng_static)" >> $GITHUB_ENV |
| 57 | + echo "LIBTIFF_LIBS=$(pkg-config --libs libtiff-4)" >> $GITHUB_ENV |
| 58 | + echo "LIBTIFF_CFLAGS=$(pkg-config --cflags libtiff-4)" >> $GITHUB_ENV |
| 59 | + echo "LIBJPEG_CFLAGS=$(pkg-config --cflags libturbojpeg)" >> $GITHUB_ENV |
| 60 | + echo "LIBJPEG_LIBS=$(pkg-config --libs libturbojpeg)" >> $GITHUB_ENV |
70 | 61 |
|
71 | 62 | - uses: ocaml/setup-ocaml@v3
|
72 | 63 | with:
|
73 |
| - ocaml-compiler: "5.2.0" |
| 64 | + ocaml-compiler: "arch-x86_64,system-mingw,ocaml.5.2.0" |
74 | 65 | opam-disable-sandboxing: true
|
75 | 66 | dune-cache: false
|
76 |
| - # opam-repositories: | |
77 |
| - # default: git+https://github.com/fdopen/opam-repository-mingw.git#opam2 |
78 |
| - |
79 |
| - - run: opam switch create 5.2.0-mingw64 arch-x86_64 system-mingw ocaml.5.2.0 |
80 | 67 |
|
81 | 68 | - name: Install deps & build
|
82 | 69 | run: |
|
83 |
| - opam switch 5.2.0-mingw64 |
84 |
| - opam install . --with-test |
| 70 | + opam install . --deps-only |
85 | 71 | opam exec -- dune build --verbose
|
86 | 72 |
|
87 | 73 | - run: opam exec -- dune build --verbose
|
|
0 commit comments