Merge pull request #970 from ocaml/opam-2.4

opam 2.4

Author: smorimoto

.github/workflows/workflow.yml

@@ -38,19 +38,18 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-24.04
-          - ubuntu-24.04-arm
-          - macos-15
-          - windows-2025
+          - ubuntu-latest
+          - macos-latest
+          - windows-latest
         ocaml-compiler:
           - "5.3"
         allow-prerelease-opam:
           - false
         include:
-          - os: ubuntu-24.04
+          - os: ubuntu-latest
             ocaml-compiler: ocaml-variants.5.3.0+options,ocaml-option-flambda
             allow-prerelease-opam: false
-          - os: ubuntu-24.04
+          - os: ubuntu-latest
             ocaml-compiler: "5.3"
             allow-prerelease-opam: true
     runs-on: ${{ matrix.os }}
@@ -74,7 +73,7 @@ jobs:
       - name: Checkout tree
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Install dependencies
-        run: pacman -Sy --noconfirm make gcc patch tar ca-certificates git rsync curl sudo bash nano coreutils xz ncurses diffutils unzip bubblewrap
+        run: pacman -Sy --noconfirm bash bubblewrap ca-certificates coreutils curl diffutils gcc git make nano ncurses patch rsync sudo tar unzip xz
       - name: Set-up OCaml
         uses: ./
         with:

dist/index.cjs

@@ -20,7 +20,7 @@ import {
 } from "./unix.js";
 
 export const latestOpamRelease = (async () => {
-  const semverRange = ALLOW_PRERELEASE_OPAM ? "*" : "<2.4.0";
+  const semverRange = ALLOW_PRERELEASE_OPAM ? "*" : "<2.5.0";
   const octokit = github.getOctokit(GITHUB_TOKEN, undefined, retry);
   const { data: releases } = await octokit.rest.repos.listReleases({
     owner: "ocaml",

packages/setup-ocaml/src/opam.ts

@@ -70,7 +70,7 @@ export async function installUnixSystemPackages() {
       break;
     }
     case "macos": {
-      await exec("brew", ["install", "darcs", "gpatch", "mercurial"]);
+      await exec("brew", ["install", "darcs", "mercurial"]);
       break;
     }
   }

packages/setup-ocaml/src/unix.ts

@@ -57,14 +57,12 @@ export async function setupCygwin() {
     }
     const packages = [
       "curl",
-      "diffutils",
       "m4",
       "make",
       "mingw64-i686-gcc-core",
       "mingw64-i686-gcc-g++",
       "mingw64-x86_64-gcc-core",
       "mingw64-x86_64-gcc-g++",
-      "patch",
       "perl",
       "rsync",
       "unzip",