Skip to content

Update JS grpc-tools to 1.12.4#21452

Merged
ravicious merged 2 commits intomasterfrom
ravicious/update-grpc-tools
Feb 9, 2023
Merged

Update JS grpc-tools to 1.12.4#21452
ravicious merged 2 commits intomasterfrom
ravicious/update-grpc-tools

Conversation

@ravicious
Copy link
Copy Markdown
Member

1.11.2 didn't have support for arm64 so we had to do all this extra stuff in the Dockerfile.

1.11.3 added support for Darwin arm64 and 1.12.4 finally adds support for Linux arm64. This means we can completely remove extra cruft and just install grpc-tools 1.12.4 on all architectures.

1.11.2 didn't have support for arm64 so we had to do all this extra stuff
in the Dockerfile.

1.11.3 added support for Darwin arm64 and 1.12.4 finally adds support for
Linux arm64. This means we can completely remove extra cruft and just
install grpc-tools 1.12.4 on all architectures.
"build-native-deps": "electron-builder install-app-deps",
"package": "electron-builder build --config electron-builder-config.js --publish never -c.extraMetadata.name=teleport-connect",
"generate-grpc-shared": "npx -y --target_arch=x64 --package=grpc_tools_node_protoc_ts@5.3.2 --package=grpc-tools@1.11.2 -- grpc_tools_node_protoc -I=src/sharedProcess/api/proto --ts_out=service=grpc-node,mode=grpc-js:src/sharedProcess/api/protogen --grpc_out=grpc_js:src/sharedProcess/api/protogen --js_out=import_style=commonjs,binary:src/sharedProcess/api/protogen src/sharedProcess/api/proto/*.proto"
"generate-grpc-shared": "npx -y --target_arch=x64 --package=grpc_tools_node_protoc_ts@5.3.2 --package=grpc-tools@1.12.4 -- grpc_tools_node_protoc -I=src/sharedProcess/api/proto --ts_out=service=grpc-node,mode=grpc-js:src/sharedProcess/api/protogen --grpc_out=grpc_js:src/sharedProcess/api/protogen --js_out=import_style=commonjs,binary:src/sharedProcess/api/protogen src/sharedProcess/api/proto/*.proto"
Copy link
Copy Markdown
Member Author

@ravicious ravicious Feb 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is related to internal protobufs used by Connect. It looks gnarly but we didn't even need to run this command since we added ptyHostService.proto.

Next time we do anything with those protos, we should move them to the proto dir in root as thanks to the webapps merge and #20810 we now have one convenient location for all protos. Actually, I'll add a comment to ptyHostService.proto about it.

@public-teleport-github-review-bot public-teleport-github-review-bot Bot removed the request for review from gzdunek February 8, 2023 19:50
@ravicious ravicious added this pull request to the merge queue Feb 9, 2023
Merged via the queue into master with commit 94ec267 Feb 9, 2023
@public-teleport-github-review-bot
Copy link
Copy Markdown

@ravicious See the table below for backport results.

Branch Result
branch/v10 Failed
branch/v11 Failed
branch/v12 Create PR

@ravicious ravicious deleted the ravicious/update-grpc-tools branch February 9, 2023 09:10
@ravicious
Copy link
Copy Markdown
Member Author

ravicious added a commit that referenced this pull request Feb 9, 2023
1.11.2 didn't have support for arm64 so we had to do all this extra stuff
in the Dockerfile.

1.11.3 added support for Darwin arm64 and 1.12.4 finally adds support for
Linux arm64. This means we can completely remove extra cruft and just
install grpc-tools 1.12.4 on all architectures.
ravicious added a commit that referenced this pull request Feb 13, 2023
1.11.2 didn't have support for arm64 so we had to do all this extra stuff
in the Dockerfile.

1.11.3 added support for Darwin arm64 and 1.12.4 finally adds support for
Linux arm64. This means we can completely remove extra cruft and just
install grpc-tools 1.12.4 on all architectures.
ravicious added a commit that referenced this pull request Feb 14, 2023
1.11.2 didn't have support for arm64 so we had to do all this extra stuff
in the Dockerfile.

1.11.3 added support for Darwin arm64 and 1.12.4 finally adds support for
Linux arm64. This means we can completely remove extra cruft and just
install grpc-tools 1.12.4 on all architectures.
ravicious added a commit that referenced this pull request Feb 14, 2023
1.11.2 didn't have support for arm64 so we had to do all this extra stuff
in the Dockerfile.

1.11.3 added support for Darwin arm64 and 1.12.4 finally adds support for
Linux arm64. This means we can completely remove extra cruft and just
install grpc-tools 1.12.4 on all architectures.
avatus pushed a commit that referenced this pull request Mar 3, 2023
* Update JS grpc-tools to 1.12.4

1.11.2 didn't have support for arm64 so we had to do all this extra stuff
in the Dockerfile.

1.11.3 added support for Darwin arm64 and 1.12.4 finally adds support for
Linux arm64. This means we can completely remove extra cruft and just
install grpc-tools 1.12.4 on all architectures.

* Add comment to ptyHostService.proto
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants