Skip to content

Commit

Permalink
Add darwin_arm64 to supported archs (bazelbuild#995)
Browse files Browse the repository at this point in the history
Also fix the npm integration tests and enable them on CI.
  • Loading branch information
thii authored Oct 26, 2021
1 parent 1fa95ad commit 41c688d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ buildifier:
platforms:
ubuntu1604:
test_targets:
- "//:tests"
- "//..."
ubuntu1804:
test_targets:
- "//:tests"
- "//..."
macos:
test_targets:
- "//:tests"
- "//..."
windows:
test_flags:
- "--enable_runfiles"
Expand Down
3 changes: 2 additions & 1 deletion launcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const spawn = require('child_process').spawn;

function getNativeBinary() {
const arch = {
'arm64' : 'arm64',
'x64' : 'amd64',
}[os.arch()];
// Filter the platform based on the platforms that are build/included.
Expand All @@ -36,7 +37,7 @@ function getNativeBinary() {
'win32' : '.exe',
}[os.platform()];

if (arch == undefined || platform == undefined) {
if (arch == undefined || platform == undefined || (arch == 'arm64' && platform == 'windows')) {
console.error(`FATAL: Your platform/architecture combination ${
os.platform()} - ${os.arch()} is not yet supported.
See instructions at https://github.com/bazelbuild/buildtools/blob/master/_TOOL_/README.md.`);
Expand Down

0 comments on commit 41c688d

Please sign in to comment.