Update mac.yml: fix pkg-config issue (#681)

* Update mac.yml: fix pkg-config issue

* Update .github/workflows/mac.yml

* deploy action should only run on the main branch

And should be updated to vefsion 4 to work with new GH security changes

* Update .github/workflows/mac.yml

* Update mac.yml

.github/workflows/mac.yml

@@ -16,6 +16,15 @@ jobs:
     steps:
       - uses: actions/checkout@main
 
+      - name: Deps
+        # git build-essential wget unzip aspcud m4 pkg-config libshp-dev libopenblas-dev liblapacke-dev
+        # homebrew in the workers comes pre-installed with the old pkg-config, which conflicts with the new pkgconf
+        run: |
+          brew unlink pkg-config
+          brew install pkgconf aspcud openblas
+          brew unlink pkgconf
+          brew link pkg-config
+
       - name: Use OCaml
         uses: ocaml/setup-ocaml@v2
         with:
@@ -24,10 +33,6 @@ jobs:
           #  *.opam
           dune-cache: true
           allow-prerelease-opam: true
-
-      - name: Deps
-        # git build-essential wget unzip aspcud m4 pkg-config libshp-dev libopenblas-dev liblapacke-dev
-        run: brew install aspcud openblas
 
       - name: OCaml Deps
         run: opam install ocaml-compiler-libs alcotest conf-openblas ctypes dune-configurator stdio npy
@@ -38,4 +43,4 @@ jobs:
       - name: Run tests
         run: |
           opam install owl-base 
-          opam exec -- dune runtest -j 1 --no-buffer -p owl
+          opam exec -- dune runtest -j 1 --no-buffer -p owl

.github/workflows/main.yml

@@ -39,7 +39,8 @@ jobs:
           opam exec -- dune build @doc
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
+        if: github.ref == 'refs/heads/main'
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: _build/default/_doc/_html