From c624a4a090bb137c4df5a01df756f40a3ebbee8b Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Fri, 17 Jan 2025 02:50:54 +0900
Subject: [PATCH 1/2] Use latest runners

Signed-off-by: Sora Morimoto <sora@morimoto.io>
---
 .github/workflows/workflow.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index c27a4b9d..cc3394dc 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -48,18 +48,19 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-latest
-          - macos-latest
-          - windows-latest
+          - ubuntu-24.04
+          - ubuntu-24.04-arm
+          - macos-15
+          - windows-2025
         ocaml-compiler:
           - "5.3"
         allow-prerelease-opam:
           - false
         include:
-          - os: ubuntu-latest
+          - os: ubuntu-24.04
             ocaml-compiler: ocaml-variants.5.3.0+options,ocaml-option-flambda
             allow-prerelease-opam: false
-          - os: ubuntu-latest
+          - os: ubuntu-24.04
             ocaml-compiler: "5.3"
             allow-prerelease-opam: true
 

From e8e50671076ec98d779b843fa90317bad2b2c50a Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Fri, 17 Jan 2025 02:52:47 +0900
Subject: [PATCH 2/2] Move `gcc-multilib` and `g++-multilib` to optional
 dependencies

Signed-off-by: Sora Morimoto <sora@morimoto.io>
---
 dist/index.js                    | 4 ++--
 packages/setup-ocaml/src/unix.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 53fddba7..c4474298 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -149833,6 +149833,8 @@ async function installUnixSystemPackages() {
     const isGitHubRunner = external_node_process_.env.GITHUB_ACTIONS === "true";
     const optionalDependencies = await retrieveInstallableOptionalDependencies([
         "darcs",
+        "g++-multilib",
+        "gcc-multilib",
         "mercurial",
     ]);
     if (isGitHubRunner) {
@@ -149842,8 +149844,6 @@ async function installUnixSystemPackages() {
                 "--yes",
                 "install",
                 "bubblewrap",
-                "g++-multilib",
-                "gcc-multilib",
                 "musl-tools",
                 "rsync",
                 ...optionalDependencies,
diff --git a/packages/setup-ocaml/src/unix.ts b/packages/setup-ocaml/src/unix.ts
index abb58704..91958593 100644
--- a/packages/setup-ocaml/src/unix.ts
+++ b/packages/setup-ocaml/src/unix.ts
@@ -36,6 +36,8 @@ export async function installUnixSystemPackages() {
   const isGitHubRunner = process.env.GITHUB_ACTIONS === "true";
   const optionalDependencies = await retrieveInstallableOptionalDependencies([
     "darcs",
+    "g++-multilib",
+    "gcc-multilib",
     "mercurial",
   ]);
   if (isGitHubRunner) {
@@ -45,8 +47,6 @@ export async function installUnixSystemPackages() {
         "--yes",
         "install",
         "bubblewrap",
-        "g++-multilib",
-        "gcc-multilib",
         "musl-tools",
         "rsync",
         ...optionalDependencies,