Merge pull request #820 from ocaml/fix-opam-selector

Fix selector to select the correct opam release asset
ocaml · Jul 1, 2024 · 0a1157c · 0a1157c
2 parents 15003b1 + 672583e
commit 0a1157c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ and this project adheres to
 
 ## [unreleased]
 
+### Fixed
+
+- Fix asset selector to select the correct opam release asset.
+
 ## [3.0.0-beta]
 
 ### Changed

diff --git a/dist/index.js b/dist/index.js
diff --git a/packages/setup-ocaml/src/opam.ts b/packages/setup-ocaml/src/opam.ts
@@ -42,9 +42,14 @@ export async function getLatestOpamRelease() {
  "Could not retrieve the opam release matching the version constraint",
  );
  }
- const matchedAssets = latestRelease.assets.find((asset) =>
- asset.browser_download_url.includes(`${ARCHITECTURE}-${PLATFORM}`),
- );
+ const matchedAssets = latestRelease.assets.find((asset) => {
+ if (PLATFORM === "windows") {
+ return asset.browser_download_url.endsWith(
+ `${ARCHITECTURE}-${PLATFORM}.exe`,
+ );
+ }
+ return asset.browser_download_url.endsWith(`${ARCHITECTURE}-${PLATFORM}`);
+ });
  if (!matchedAssets) {
  throw new Error(
  "Could not find any assets matching the current platform or architecture",