CI: move

Author: hhugo

.github/workflows/build.yml

@@ -97,6 +97,14 @@ jobs:
           # try to install them anyways, so we save an apt-roundtrip.
           sudo aptitude -o Acquire::Retries=30 install gcc-multilib g++-multilib pkg-config libgmp-dev libgmp-dev:i386 libx11-dev:i386 -y
 
+      - name: macos fix
+        if: runner.os == 'Macos'
+        run: |
+          brew update
+          brew upgrade
+          brew install pkgconf
+          # work around https://github.com/actions/runner-images/issues/10984
+
       - name: Checkout tree
         uses: actions/checkout@v4
 
@@ -112,31 +120,13 @@ jobs:
           dune-cache: true
           opam-pin: false
 
-      - name: Pin dune
-        run: |
-          opam pin add dune.3.17 https://github.com/ocaml/dune.git
-
       - run: opam install conf-pkg-config
         if: runner.os == 'Windows'
 
       - run: opam install . --best-effort
         if: ${{ matrix.skip-test }}
 
-      - run: cat VERSION | xargs opam pin wasm_of_ocaml-compiler . -n --with-version 
-        if: ${{ !matrix.skip-test }}
-        shell: bash
-
-      - run: opam install conf-c++
-        # Otherwise, the next step fails reinstalling gcc while compiling
-        # other packages
-        if: ${{ !matrix.skip-test && runner.os == 'Windows' }}
-
-      - run: opam install . --with-test --deps-only
-        # Install the test dependencies
-        if: ${{ !matrix.skip-test }}
-
-      - run: opam install .
-        # Install the packages (without running the tests)
+      - run: opam install . --with-test
         if: ${{ !matrix.skip-test }}
 
       - run: opam exec -- make all
@@ -164,44 +154,4 @@ jobs:
           branch: wikidoc
           folder: doc-dev
           clean: true
-          target-folder: doc/dev/
-
-  lint-opam:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout tree
-        uses: actions/checkout@v4
-      - name: Set-up OCaml
-        uses: ocaml/setup-ocaml@v3
-        with:
-          ocaml-compiler: "5.2"
-          dune-cache: true
-      - name: Pin dune
-        run: |
-          opam pin add -n dune.3.17 https://github.com/ocaml/dune.git
-      - uses: ocaml/setup-ocaml/lint-opam@v3
-
-  lint-fmt:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout tree
-        uses: actions/checkout@v4
-      - name: Set-up OCaml
-        uses: ocaml/setup-ocaml@v3
-        with:
-          ocaml-compiler: "5.2"
-          dune-cache: true
-      - name: Pin dune
-        run: |
-          opam pin add -n dune.3.17 https://github.com/ocaml/dune.git
-      - uses: ocaml/setup-ocaml/lint-fmt@v3
-
-  lint-runtime:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout tree
-        uses: actions/checkout@v4
-      - name: Set-up Biome
-        uses: biomejs/setup-biome@v2
-      - name: Run biome
-        run: biome ci
+          target-folder: doc/dev/

.github/workflows/lint.yml

@@ -0,0 +1,42 @@
+name: lint
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  lint-opam:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout tree
+        uses: actions/checkout@v4
+      - name: Set-up OCaml
+        uses: ocaml/setup-ocaml@v3
+        with:
+          ocaml-compiler: "5.2"
+          dune-cache: true
+      - uses: ocaml/setup-ocaml/lint-opam@v3
+
+  lint-fmt:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout tree
+        uses: actions/checkout@v4
+      - name: Set-up OCaml
+        uses: ocaml/setup-ocaml@v3
+        with:
+          ocaml-compiler: "5.2"
+          dune-cache: true
+      - uses: ocaml/setup-ocaml/lint-fmt@v3
+
+  lint-runtime:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout tree
+        uses: actions/checkout@v4
+      - name: Set-up Biome
+        uses: biomejs/setup-biome@v2
+      - name: Run biome
+        run: biome ci