From f789f9e00023e8a4ef78fb21816e1ac0cb32d4ad Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Fri, 18 Apr 2025 21:49:52 +0900 Subject: [PATCH 1/3] Always allow pre-release opam Signed-off-by: Sora Morimoto --- .github/workflows/workflow.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index ccfe1823..f82b1796 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -54,15 +54,9 @@ jobs: - windows-2025 ocaml-compiler: - "5.3" - allow-prerelease-opam: - - false include: - os: ubuntu-24.04 ocaml-compiler: ocaml-variants.5.3.0+options,ocaml-option-flambda - allow-prerelease-opam: false - - os: ubuntu-24.04 - ocaml-compiler: "5.3" - allow-prerelease-opam: true runs-on: ${{ matrix.os }} @@ -74,6 +68,6 @@ jobs: uses: ./ with: ocaml-compiler: ${{ matrix.ocaml-compiler }} - allow-prerelease-opam: ${{ matrix.allow-prerelease-opam }} + allow-prerelease-opam: true - run: opam install ssl From e4b971de407504858d258c7646fd6f126eb189d9 Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Fri, 18 Apr 2025 21:54:51 +0900 Subject: [PATCH 2/3] GNU `patch` and `diff` command are no longer runtime dependencies Signed-off-by: Sora Morimoto --- dist/index.cjs | 4 +--- packages/setup-ocaml/src/unix.ts | 2 +- packages/setup-ocaml/src/windows.ts | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dist/index.cjs b/dist/index.cjs index e86b39c7..0d10ff35 100644 --- a/dist/index.cjs +++ b/dist/index.cjs @@ -124005,7 +124005,7 @@ async function installUnixSystemPackages() { break; } case "macos": { - await (0, import_exec.exec)("brew", ["install", "darcs", "gpatch", "mercurial"]); + await (0, import_exec.exec)("brew", ["install", "darcs", "mercurial"]); break; } } @@ -139004,14 +139004,12 @@ 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" diff --git a/packages/setup-ocaml/src/unix.ts b/packages/setup-ocaml/src/unix.ts index d5fd44f0..64339fbe 100644 --- a/packages/setup-ocaml/src/unix.ts +++ b/packages/setup-ocaml/src/unix.ts @@ -56,7 +56,7 @@ export async function installUnixSystemPackages() { break; } case "macos": { - await exec("brew", ["install", "darcs", "gpatch", "mercurial"]); + await exec("brew", ["install", "darcs", "mercurial"]); break; } } diff --git a/packages/setup-ocaml/src/windows.ts b/packages/setup-ocaml/src/windows.ts index 2fb10719..413731ae 100644 --- a/packages/setup-ocaml/src/windows.ts +++ b/packages/setup-ocaml/src/windows.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", From f9b1f9a94f6caa51503b2d3336384f440a646e87 Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Fri, 18 Apr 2025 22:07:24 +0900 Subject: [PATCH 3/3] Unlock opam 2.4 Signed-off-by: Sora Morimoto --- dist/index.cjs | 2 +- packages/setup-ocaml/src/opam.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/index.cjs b/dist/index.cjs index 0d10ff35..e1fdc199 100644 --- a/dist/index.cjs +++ b/dist/index.cjs @@ -124028,7 +124028,7 @@ async function updateUnixPackageIndexFiles() { // src/opam.ts var latestOpamRelease = (async () => { - const semverRange = ALLOW_PRERELEASE_OPAM ? "*" : "<2.4.0"; + const semverRange = ALLOW_PRERELEASE_OPAM ? "*" : "<2.5.0"; const octokit = github.getOctokit(GITHUB_TOKEN, void 0, retry); const { data: releases } = await octokit.rest.repos.listReleases({ owner: "ocaml", diff --git a/packages/setup-ocaml/src/opam.ts b/packages/setup-ocaml/src/opam.ts index 56b2c478..6fb25425 100644 --- a/packages/setup-ocaml/src/opam.ts +++ b/packages/setup-ocaml/src/opam.ts @@ -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",