Skip to content

Commit

Permalink
fix: use @pingghost/protoc to compile proto files
Browse files Browse the repository at this point in the history
The npm package previously used (`protoc`) is still lacking apple arm32 support, see YePpHa/node-protoc#10
  • Loading branch information
giacomocusinato committed Jul 8, 2024
1 parent 2e78e96 commit f842bad
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion arduino-ide-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
},
"optionalDependencies": {
"grpc-tools": "^1.12.4",
"protoc": "^1.0.4"
"@pingghost/protoc": "^1.0.2"
},
"mocha": {
"require": [
Expand Down
5 changes: 3 additions & 2 deletions arduino-ide-extension/scripts/generate-protocol.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
const { exec } = require('./utils');
const glob = require('glob');
const { SemVer, gte, valid: validSemVer } = require('semver');
const protoc = path.dirname(require('protoc/protoc'));

// Use a node-protoc fork until apple arm32 is supported
// https://github.com/YePpHa/node-protoc/pull/10
const protoc = path.dirname(require('@pingghost/protoc/protoc'));
const repository = await fs.mkdtemp(path.join(os.tmpdir(), 'arduino-cli-'));

const { owner, repo, commitish } = (() => {
Expand Down
26 changes: 13 additions & 13 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1899,6 +1899,19 @@
"@phosphor/signaling" "^1.3.1"
"@phosphor/virtualdom" "^1.2.0"

"@pingghost/protoc@^1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@pingghost/protoc/-/protoc-1.0.2.tgz#68436fe6df7b700149dfb2b9a6a9db3b66fe758a"
integrity sha512-7ndq6JmrfcRfr6wIxdrjBqAipsrWwldFL5TQRmJXgpGrRi1yU6vKWID6Z4cs96iK+3yLIoUON11fE5CThNBrXA==
dependencies:
glob "^7.2.3"
mkdirp "^0.5.6"
node-fetch "^3.2.10"
rimraf "^3.0.2"
unzipper "^0.10.11"
uuid "^9.0.0"
vinyl "^2.2.1"

"@pkgjs/parseargs@^0.11.0":
version "0.11.0"
resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
Expand Down Expand Up @@ -11100,19 +11113,6 @@ protobufjs@^7.2.3, protobufjs@^7.2.4:
"@types/node" ">=13.7.0"
long "^5.0.0"

protoc@^1.0.4:
version "1.1.3"
resolved "https://registry.yarnpkg.com/protoc/-/protoc-1.1.3.tgz#d9857ec2a43a683af8263032d519ce7ba0b7d99e"
integrity sha512-Vy4OBxCcF0W38YrZZRFix659gFu8ujIxVDP1SUBK9ELzyeMSBe8m8tYyYlX1PI5j9gse9hWu4c4nzQaHesAf8Q==
dependencies:
glob "^7.2.3"
mkdirp "^0.5.6"
node-fetch "^3.2.10"
rimraf "^3.0.2"
unzipper "^0.10.11"
uuid "^9.0.0"
vinyl "^2.2.1"

protocols@^2.0.0, protocols@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/protocols/-/protocols-2.0.1.tgz#8f155da3fc0f32644e83c5782c8e8212ccf70a86"
Expand Down

0 comments on commit f842bad

Please sign in to comment.