Skip to content

Commit 44ad89c

Browse files
authored
Merge pull request #180 from dra27/macos-depext
[v1] Fix compatibility on macOS
2 parents 6d924c1 + 50e6de0 commit 44ad89c

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

.eslintrc.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
{
22
"env": { "node": true },
33
"parser": "@typescript-eslint/parser",
4-
"parserOptions": { "ecmaVersion": 2020, "sourceType": "module" },
4+
"parserOptions": { "ecmaVersion": 2021, "sourceType": "module" },
55
"extends": [
66
"eslint:recommended",
77
"plugin:@typescript-eslint/eslint-recommended",
88
"plugin:@typescript-eslint/recommended",
99
"plugin:import/errors",
1010
"plugin:import/typescript",
1111
"plugin:import/warnings",
12-
"plugin:prettier/recommended",
13-
"prettier/@typescript-eslint"
12+
"plugin:prettier/recommended"
1413
],
1514
"plugins": ["@typescript-eslint", "simple-import-sort"],
1615
"settings": {

.github/workflows/workflow.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ jobs:
5050
with:
5151
ocaml-version: ${{ matrix.ocaml-version }}
5252

53+
- run: opam install yaml --verbose --confirm-level=unsafe-yes --cli=2.1
54+
if: runner.os == 'macOS'
55+
5356
- run: opam depext yaml --install --verbose --yes
57+
if: runner.os != 'macOS'
5458

5559
- name: Check formatting
5660
run: yarn fmt:check

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ and this project adheres to
88

99
## [unreleased]
1010

11+
### Fixed
12+
13+
- Stop installing `depext` package on macOS runners (opam is now at 2.1.0).
14+
1115
## [1.1.11]
1216

1317
### Changed

dist/index.js

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/installer.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ async function acquireOpamDarwin(version: string, customRepository: string) {
8989
await exec("brew", ["install", "opam"]);
9090
await exec("opam", ["init", "--bare", "-yav", repository]);
9191
await exec(path.join(__dirname, "install-ocaml-unix.sh"), [version]);
92-
await exec("opam", ["install", "-y", "depext"]);
9392
}
9493

9594
export async function getOpam(

0 commit comments

Comments
 (0)