X

dmtrKovalenko · Aug 18, 2024 · 0715de0 · 0715de0
1 parent 59d68d6
commit 0715de0
Showing 1 changed file with 8 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,14 +8,9 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest]
-    defaults:
-      run:
-        shell: bash
     steps:
       - run: git config --global core.autocrlf input
       - uses: actions/checkout@v2.3.2
-        with:
-          packages: pkg-config
       - uses: cygwin/cygwin-install-action@master
       - shell: bash
         run: rm -rf $(which pkg-config)
@@ -43,26 +38,25 @@ jobs:
           echo "PKG_CONFIG_PATH=${GITHUB_WORKSPACE}/vcpkg_installed/${VCPKG_DEFAULT_TRIPLET}/lib/pkgconfig" >> $GITHUB_ENV
 
       - name: Set pkg-config path on Unix
-        shell: cmd
+        shell: bash
         if: runner.os  == 'Windows'
         run: |
           echo "PKG_CONFIG_PATH=${GITHUB_WORKSPACE}\vcpkg_installed\\${VCPKG_DEFAULT_TRIPLET}\lib\pkgconfig" >> $GITHUB_ENV
 
-      - shell: cmd
-        run: |
+      - run: |
           choco install pkgconfiglite
 
       # - run: git config --global core.autocrlf input
       # - uses: cygwin/cygwin-install-action@master
 
       - shell: bash
         run: |
-          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
-          echo "LIBJPEG_LIBS=$(pkg-config --libs libturbojpeg)" >> $GITHUB_ENV
+          echo "LIBPNG_CFLAGS=lol" >> $GITHUB_ENV
+          echo "LIBPNG_LIBS=lol" >> $GITHUB_ENV
+          echo "LIBTIFF_LIBS=lol" >> $GITHUB_ENV
+          echo "LIBTIFF_CFLAGS=lol" >> $GITHUB_ENV
+          echo "LIBJPEG_CFLAGS=lol" >> $GITHUB_ENV
+          echo "LIBJPEG_LIBS=lol" >> $GITHUB_ENV
 
           # curl -L -o opam64.tar.xz https://github.com/fdopen/opam-repository-mingw/releases/download/0.0.0.2/opam64.tar.xz
           # tar -xf opam64.tar.xz
@@ -82,7 +76,6 @@ jobs:
       - name: Install deps & build
         run: |
           opam switch 4.14.2-mingw64
-          eval $(opam env --switch=4.14.2-mingw64)
           opam install .  --with-test
           opam exec -- dune build --verbose