Merge pull request #37 from jmid/add-dependabot

jmid · web-flow · commit f293e6479281 · 2025-03-04T22:53:53.000+01:00
Add dependabot checking github actions and tweak existing CI
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,9 +3,6 @@ name: Main CI workflow
 on:
   pull_request:
   push:
-  schedule:
-    # Prime the caches every Monday
-    - cron: 0 1 * * MON
 
 jobs:
   build:
@@ -23,6 +20,8 @@ jobs:
 #          - 4.11.x
           - 4.12.x
 #          - 4.13.x
+          - 4.14.x
+          - 5.3.x
 
     runs-on: ${{ matrix.os }}
 
@@ -31,7 +30,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Use OCaml ${{ matrix.ocaml-compiler }}
-        uses: ocaml/setup-ocaml@v2
+        uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
 
@@ -47,7 +46,7 @@ jobs:
           echo "$(brew --prefix)/opt/coreutils/libexec/gnubin" >> $GITHUB_PATH
           echo "$PATH"
           echo `which timeout`
-          ls /usr/local/opt/coreutils/libexec/gnubin
+#         ls /usr/local/opt/coreutils/libexec/gnubin
 
       - run: opam install . --deps-only --with-test
 
diff --git a/test/negative-tests/ppx-negtests.t b/test/negative-tests/ppx-negtests.t
@@ -228,7 +228,7 @@ Instrument and check that it was received
   > )
   > EOF
 
-  $ bash ../filter_dune_build.sh ./test.bc --instrument-with mutaml 2>&1 | grep -v "no-merge\|Embed errors\|keywords"
+  $ bash ../filter_dune_build.sh ./test.bc --instrument-with mutaml 2>&1 | grep -v "use-compiler-pp\|no-merge\|Embed errors\|keywords"
   ppx.exe [extra_args] [<files>]
     -as-ppx                     Run as a -ppx rewriter (must be the first argument)
     --as-ppx                    Same as -as-ppx
