Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up internal implementation around opam #714

Merged
merged 1 commit into from
Oct 23, 2023
Merged

Clean up internal implementation around opam #714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 21 additions & 24 deletions dist/index.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 21 additions & 24 deletions dist/post/index.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 30 additions & 24 deletions packages/setup-ocaml/src/opam.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ export async function getLatestOpamRelease() {
const { data: releases } = await octokit.rest.repos.listReleases({
owner: "ocaml",
repo: "opam",
per_page: 100,
});
const matchedReleases = releases
.filter((release) =>
Expand All @@ -47,22 +46,25 @@ export async function getLatestOpamRelease() {
semver.rcompare(v1, v2, { loose: true }),
);
const latestRelease = matchedReleases.at(0);
if (latestRelease === undefined) {
throw new Error("latestRelease not found");
} else {
const { assets, tag_name: version } = latestRelease;
const architecture = getArchitecture();
const platform = getPlatform();
const matchedAssets = assets.find(({ browser_download_url }) =>
browser_download_url.includes(`${architecture}-${platform}`),
if (!latestRelease) {
throw new Error(
"Could not retrieve the opam release matching the version constraint",
);
if (matchedAssets === undefined) {
throw new Error("matchedAssets not found");
} else {
const { browser_download_url: browserDownloadUrl } = matchedAssets;
return { version, browserDownloadUrl };
}
}
const architecture = getArchitecture();
const platform = getPlatform();
const matchedAssets = latestRelease.assets.find((asset) =>
asset.browser_download_url.includes(`${architecture}-${platform}`),
);
if (!matchedAssets) {
throw new Error(
"Could not find any assets matching the current platform or architecture",
);
}
return {
version: latestRelease.tag_name,
browserDownloadUrl: matchedAssets.browser_download_url,
};
}

async function findOpam() {
Expand Down Expand Up @@ -381,16 +383,20 @@ async function repositoryRemove(name: string) {
}

async function repositoryList() {
let output = "";
const opam = await findOpam();
await exec(opam, ["repository", "list", "--all-switches", "--short"], {
listeners: { stdout: (data) => (output += data.toString()) },
});
const result = output
.split("\n")
.map((repository) => repository.trim())
.filter((repository) => repository.length > 0);
return result;
const repositoryList = await getExecOutput(
opam,
["repository", "list", "--all-switches", "--short"],
{ ignoreReturnCode: true },
);
if (repositoryList.exitCode === 0) {
return repositoryList.stdout
.split("\n")
.map((repository) => repository.trim())
.filter((repository) => repository.length > 0);
} else {
return [];
}
}

export async function repositoryRemoveAll() {
Expand Down