Skip to content

Commit 34bb783

Browse files
authored
Merge pull request #242 from aminya/macos-arm [skip test]
2 parents 17a5a83 + cceb0f9 commit 34bb783

File tree

20 files changed

+64
-83
lines changed

20 files changed

+64
-83
lines changed

.github/workflows/CI.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
run: |
6868
if [ "$(git diff --ignore-space-at-eol --text dist/ | wc -l)" -gt "0" ]; then
6969
echo "Detected uncommitted changes after build. See status below:"
70-
git diff --ignore-space-at-eol --text dist/
70+
git diff --ignore-space-at-eol --text dist/ ':(exclude)*.js.map'
7171
exit 1
7272
fi
7373
@@ -92,6 +92,7 @@ jobs:
9292
os:
9393
- windows-2022
9494
- ubuntu-22.04
95+
- macos-13
9596
- macos-12
9697
node:
9798
- 20

dev/scripts/debug_remove.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

dist/actions/setup-cpp.js

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

dist/actions/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/legacy/setup-cpp.js

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

dist/legacy/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/modern/setup-cpp.js

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

dist/modern/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
"src",
2020
"packages",
2121
"dev/docker",
22-
"dev/docker/__tests__",
2322
"README.md",
2423
"LICENSE.txt",
2524
"LICENSE.dependencies.txt",
@@ -47,10 +46,6 @@
4746
"lint.tsc": "tsc --noEmit",
4847
"pack.exe": "shx rm -rf ./dist/tsconfig.tsbuildinfo && node ./dev/scripts/pack-exe.mjs",
4948
"prepublishOnly": "rm ./dist/tsconfig.tsbuildinfo",
50-
"start.docker": "docker run -t setup-cpp .",
51-
"start.docker.arch": "docker run -t setup-cpp:arch .",
52-
"start.docker.fedora": "docker run -t setup-cpp:fedora .",
53-
"start.docker.ubuntu": "docker run -t setup-cpp:ubuntu .",
5449
"test.lint": "run-p --aggregate-output --continue-on-error lint.cspell test.lint.eslint test.lint.dprint lint.tsc",
5550
"test.lint.eslint": "eslint **/*.{ts,tsx,js,jsx,cjs,mjs,json,yaml} --no-error-on-unmatched-pattern --cache --cache-location ./.cache/eslint/",
5651
"test.lint.dprint": "dprint check",

src/brew/brew.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { mkdirP } from "@actions/io"
22
import { execaSync } from "execa"
3-
import { readFileSync } from "fs"
3+
import { readFile } from "fs/promises"
44
import { tmpdir } from "os"
55
import path, { join } from "path"
66
import { dirname } from "patha"
@@ -35,8 +35,7 @@ export async function setupBrew(_version: string, _setupDir: string, _arch: stri
3535
const installSh = join(brewTempDirectory, "install.sh")
3636

3737
if (process.platform === "linux") {
38-
const installShContent = readFileSync(installSh, "utf-8")
39-
38+
const installShContent = await readFile(installSh, "utf-8")
4039
installShContent.replace("#!/bin/bash", "")
4140
}
4241

0 commit comments

Comments
 (0)