Merge pull request #924 from ocaml/update-latest-runners

Add support for latest runners
ocaml · Jan 16, 2025 · bd3f915 · bd3f915
2 parents aef2b58 + e8e5067
commit bd3f915
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git 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
 

diff --git a/dist/index.js b/dist/index.js
diff --git 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,