From 7da1ac2af103c860c80960f9baea350fc4254447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= <thevoodoos@gmail.com>
Date: Tue, 31 Aug 2021 17:30:47 +0200
Subject: [PATCH 70/75] [wip] Update Github actions

CI tweak

Fix ocaml version in workflow

Fix setup ocaml config

Tweak the tweaks

Use correct compiler name

Co-authored-by: Kate <kit.ty.kate@disroot.org>

Use beta repository

Co-authored-by: Kate <kit.ty.kate@disroot.org>
---
 .github/workflows/main.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e7fd33cb..da813371 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,8 +23,8 @@ jobs:
           - macos-latest
           - ubuntu-latest
           - windows-latest
-        ocaml-version:
-          - 4.12.0
+        ocaml-compiler:
+          - ocaml-base-compiler.4.13.0~beta1
     # The type of runner that the job will run on
     runs-on: ${{ matrix.os }}
 
@@ -38,13 +38,16 @@ jobs:
           # A directory to store and save the cache
           path: ~/.opam
           # An explicit key for restoring and saving the cache
-          key: ${{ matrix.os }}-${{ matrix.ocaml-version }}-${{ hashFiles('*.opam') }}-build
-      - name: Set up OCaml ${{ matrix.ocaml-version }}
-        uses: avsm/setup-ocaml@v1
+          key: ${{ matrix.os }}-${{ matrix.ocaml-compiler }}-${{ hashFiles('*.opam') }}-build
+
+      - name: Set up OCaml ${{ matrix.ocaml-compiler }}
+        uses: ocaml/setup-ocaml@v2
         with:
           # Version of the OCaml compiler to initialise
-          ocaml-version: ${{ matrix.ocaml-version }}
+          ocaml-compiler: ${{ matrix.ocaml-compiler }}
+          opam-repositories: |
+            default: https://github.com/ocaml/opam-repository.git
+            beta: https://github.com/ocaml/ocaml-beta-repository.git
 
-      - run: opam depext conf-jq --yes # opam depext bug
       - run: opam install . --deps-only --with-test
       - run: opam exec -- dune runtest -p merlin,dot-merlin-reader
-- 
2.32.0