ci: speed up opam ci (#1229)

melange-re · Nov 18, 2024 · b732f4b · b732f4b
1 parent 61c0243
commit b732f4b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/.github/workflows/opam-build.yml b/.github/workflows/opam-build.yml
@@ -25,22 +25,21 @@ jobs:
           - ubuntu-latest
           # - windows-latest # for some reason windows build is not picking dune 3.5
         ocaml-compiler:
-          - ocaml-variants.5.3.0+trunk
-          # - ocaml-base-compiler.5.3.0~beta1
+          - ocaml-base-compiler.5.3.0~beta1
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
           path: melange
 
       - name: Use Node
         uses: actions/setup-node@v4
         with:
-          node-version: 21
+          node-version: 22
 
       - name: Install Homebrew dependencies
         if: ${{ matrix.os == 'macos-latest' }}
@@ -52,6 +51,15 @@ jobs:
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
 
+      - name: Restore OPAM cache
+        id: opam-cache
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            ~/.opam
+            ~/work/melange/melange/_opam
+          key: opam-${{ matrix.os }}-${{ matrix.ocaml-compiler }}-${{ hashFiles('melange/*.opam') }}
+
       - name: Install dependencies
         working-directory: melange
         run: |
@@ -79,3 +87,12 @@ jobs:
         working-directory: melange-opam-template
         run: |
           node ./_build/default/src/node/src/Hello.mjs
+
+      - name: Save OPAM cache
+        uses: actions/cache/save@v4
+        if: steps.opam-cache.outputs.cache-hit != 'true'
+        with:
+          path: |
+            ~/.opam
+            ~/work/melange/melange/_opam
+          key: opam-${{ matrix.os }}-${{ matrix.ocaml-compiler }}-${{ hashFiles('melange/*.opam') }}
diff --git a/Makefile b/Makefile
@@ -29,8 +29,9 @@ opam-create-switch: ## Create opam switch
 
 .PHONY: opam-install-test
 opam-install-test: ## Install test dependencies
-	opam pin add melange.dev . --with-test -y
-	opam pin add melange-playground.dev . --with-test -y
+	opam pin add melange.dev . --with-test -y --no-action
+	opam pin add melange-playground.dev . --with-test -y --no-action
+	opam install melange.dev melange-playground.dev -t
 
 .PHONY: opam-install-dev
 opam-install-dev: opam-install-test ## Install development dependencies