Skip to content

Commit f20f44b

Browse files
authored
Merge pull request #970 from ocaml/opam-2.4
opam 2.4
2 parents e32b4d7 + b4bf062 commit f20f44b

File tree

5 files changed

+10
-15
lines changed

5 files changed

+10
-15
lines changed

.github/workflows/workflow.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,18 @@ jobs:
3838
fail-fast: false
3939
matrix:
4040
os:
41-
- ubuntu-24.04
42-
- ubuntu-24.04-arm
43-
- macos-15
44-
- windows-2025
41+
- ubuntu-latest
42+
- macos-latest
43+
- windows-latest
4544
ocaml-compiler:
4645
- "5.3"
4746
allow-prerelease-opam:
4847
- false
4948
include:
50-
- os: ubuntu-24.04
49+
- os: ubuntu-latest
5150
ocaml-compiler: ocaml-variants.5.3.0+options,ocaml-option-flambda
5251
allow-prerelease-opam: false
53-
- os: ubuntu-24.04
52+
- os: ubuntu-latest
5453
ocaml-compiler: "5.3"
5554
allow-prerelease-opam: true
5655
runs-on: ${{ matrix.os }}
@@ -74,7 +73,7 @@ jobs:
7473
- name: Checkout tree
7574
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7675
- name: Install dependencies
77-
run: pacman -Sy --noconfirm make gcc patch tar ca-certificates git rsync curl sudo bash nano coreutils xz ncurses diffutils unzip bubblewrap
76+
run: pacman -Sy --noconfirm bash bubblewrap ca-certificates coreutils curl diffutils gcc git make nano ncurses patch rsync sudo tar unzip xz
7877
- name: Set-up OCaml
7978
uses: ./
8079
with:

dist/index.cjs

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/setup-ocaml/src/opam.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
} from "./unix.js";
2121

2222
export const latestOpamRelease = (async () => {
23-
const semverRange = ALLOW_PRERELEASE_OPAM ? "*" : "<2.4.0";
23+
const semverRange = ALLOW_PRERELEASE_OPAM ? "*" : "<2.5.0";
2424
const octokit = github.getOctokit(GITHUB_TOKEN, undefined, retry);
2525
const { data: releases } = await octokit.rest.repos.listReleases({
2626
owner: "ocaml",

packages/setup-ocaml/src/unix.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export async function installUnixSystemPackages() {
7070
break;
7171
}
7272
case "macos": {
73-
await exec("brew", ["install", "darcs", "gpatch", "mercurial"]);
73+
await exec("brew", ["install", "darcs", "mercurial"]);
7474
break;
7575
}
7676
}

packages/setup-ocaml/src/windows.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,12 @@ export async function setupCygwin() {
5757
}
5858
const packages = [
5959
"curl",
60-
"diffutils",
6160
"m4",
6261
"make",
6362
"mingw64-i686-gcc-core",
6463
"mingw64-i686-gcc-g++",
6564
"mingw64-x86_64-gcc-core",
6665
"mingw64-x86_64-gcc-g++",
67-
"patch",
6866
"perl",
6967
"rsync",
7068
"unzip",

0 commit comments

Comments
 (0)