Update GitHub Actions (#1078)

Signed-off-by: Sora Morimoto <[email protected]>
mirage · Sep 3, 2024 · f43be8f · f43be8f
1 parent 53fbf39
commit f43be8f
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 39 deletions.
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/changelog.yml b/.github/workflows/changelog.yml
@@ -2,8 +2,8 @@ name: Changelog check
 
 on:
   pull_request:
-    branches: [ master ]
-    types: [ opened, synchronize, reopened, labeled, unlabeled ]
+    branches: [master]
+    types: [opened, synchronize, reopened, labeled, unlabeled]
 
 jobs:
   Changelog-Entry-Check:

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -8,12 +8,11 @@ jobs:
     env:
       NIXPKGS_ALLOW_INSECURE: 1
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-      with:
-        submodules: true
-    - uses: cachix/install-nix-action@v27
-      with:
-        nix_path: nixpkgs=channel:nixos-unstable
-    - run: |
-        nix develop -c dune build @runtest @check
+      - name: Checkout tree
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+      - uses: cachix/install-nix-action@v27
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - run: nix develop -c dune build @runtest @check
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -22,8 +22,8 @@ jobs:
           - ubuntu-latest
           - macos-latest
         ocaml-compiler:
-          - 4.14
-          - 5.x
+          - "4.14"
+          - "5"
         local-packages:
           - |
             *.opam
@@ -35,21 +35,19 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - name: Checkout code
+      - name: Checkout tree
         uses: actions/checkout@v4
 
-      - name: Use OCaml ${{ matrix.ocaml-compiler }}
-        uses: ocaml/setup-ocaml@v2
+      - name: Set-up OCaml ${{ matrix.ocaml-compiler }}
+        uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
-          dune-cache: ${{ matrix.os == 'ubuntu-latest' }}
-          opam-depext: true
-          opam-depext-flags: --with-test
+          dune-cache: true
           opam-local-packages: ${{ matrix.local-packages }}
 
       - run: |
           sudo apt-get update && sudo apt-get upgrade
-          opam depext conf-libcurl
+          opam install conf-libcurl
         if: ${{ matrix.os == 'ubuntu-latest' }}
 
       - run: echo "PKG_CONFIG_PATH=$(brew --prefix openssl)/lib/pkgconfig" >>"$GITHUB_ENV"
@@ -68,8 +66,8 @@ jobs:
           - ubuntu-latest
           - macos-latest
         ocaml-compiler:
-          - 4.14
-          - 5.x
+          - "4.14"
+          - "5"
         local-packages:
           - |
             *.opam
@@ -85,21 +83,19 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - name: Checkout code
+      - name: Checkout tree
         uses: actions/checkout@v4
 
-      - name: Use OCaml ${{ matrix.ocaml-compiler }}
-        uses: ocaml/setup-ocaml@v2
+      - name: Set-up OCaml ${{ matrix.ocaml-compiler }}
+        uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
-          dune-cache: ${{ matrix.os == 'ubuntu-latest' }}
-          opam-depext: true
-          opam-depext-flags: --with-test
+          dune-cache: true
           opam-local-packages: ${{ matrix.local-packages }}
 
       - run: |
           sudo apt-get update && sudo apt-get upgrade
-          opam depext conf-libcurl
+          opam install conf-libcurl
         if: ${{ matrix.os == 'ubuntu-latest' }}
 
       - run: echo "PKG_CONFIG_PATH=$(brew --prefix openssl)/lib/pkgconfig" >>"$GITHUB_ENV"
@@ -118,7 +114,7 @@ jobs:
           - ubuntu-latest
           - macos-latest
         ocaml-compiler:
-          - 5.x
+          - "5"
         local-packages:
           - |
             http.opam
@@ -128,14 +124,14 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - name: Checkout code
+      - name: Checkout tree
         uses: actions/checkout@v4
 
-      - name: Use OCaml ${{ matrix.ocaml-compiler }}
-        uses: ocaml/setup-ocaml@v2
+      - name: Set-up OCaml ${{ matrix.ocaml-compiler }}
+        uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
-          dune-cache: ${{ matrix.os == 'ubuntu-latest' }}
+          dune-cache: true
           opam-local-packages: ${{ matrix.local-packages }}
           opam-repositories: |
             default: https://github.com/ocaml/opam-repository.git
@@ -153,22 +149,22 @@ jobs:
         os:
           - ubuntu-latest
         ocaml-compiler:
-          - 5.x
+          - "5"
         local-packages:
           - |
             *.opam
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - name: Checkout code
+      - name: Checkout tree
         uses: actions/checkout@v4
 
-      - name: Use OCaml ${{ matrix.ocaml-compiler }}
-        uses: ocaml/setup-ocaml@v2
+      - name: Set-up OCaml ${{ matrix.ocaml-compiler }}
+        uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
-          dune-cache: ${{ matrix.os == 'ubuntu-latest' }}
+          dune-cache: true
           opam-local-packages: ${{ matrix.local-packages }}
           opam-repositories: |
             default: https://github.com/ocaml/opam-repository.git