scripts: improve regenerate.sh to use the correct proto compiler version #7064

aranjans · 2024-03-25T08:39:33Z

RELEASE NOTES: n/a

codecov · 2024-03-25T08:42:14Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 80.70%. Comparing base (adf976b) to head (b3106cc).
Report is 84 commits behind head on master.

❗ Current head b3106cc differs from pull request most recent head 77ac334

Please upload reports for the commit 77ac334 to get more accurate results.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #7064      +/-   ##
==========================================
- Coverage   81.24%   80.70%   -0.54%     
==========================================
  Files         345      346       +1     
  Lines       33941    33802     -139     
==========================================
- Hits        27574    27280     -294     
- Misses       5202     5355     +153     
- Partials     1165     1167       +2

see 33 files with indirect coverage changes

arvindbr8

I would prefer if we didnt track the version of protoc in different places.

What might be nicer is if both regenerate.sh and vet.sh points to the same place to install protoc. Also note ./vet.sh -install basically does the same thing of installing protoc for Github Actions.

I prefer creating a new script which installs protoc based on the ${OS}. And for ./vet -install I could call into the script to install the linux and x86_64 flavor of protoc. And do something similar for regenerate.sh

vet.sh

regenerate.sh

arvindbr8

I've made a few comments on your change. Could you please take a look at it?

protoc_installer.sh

regenerate.sh

protoc_installer.sh

aranjans · 2024-05-09T12:44:26Z

@arvindbr8 In contrast to this comment, first comment is resolved but i didn't understand the second one. Can you be more specific on that?

arvindbr8 · 2024-05-09T18:36:20Z

there is a TODO in the file which marks this PR. As part of nixing the TODO comment, i think this does not be applicable

die "-install currently intended for use in CI only."

github-actions · 2024-05-15T20:45:58Z

This PR is labeled as requiring an update from the reporter, and no update has been received after 6 days. If no update is provided in the next 7 days, this issue will be automatically closed.

scripts/install_protoc.sh

arvindbr8 · 2024-05-28T23:31:02Z

scripts/install_protoc.sh

+PROTOC_VERSION="25.2"
+
+# Function to download pre-built binaries for Linux with
+# ARCH as $1, OS as $2, and WORKDIR as $3 arguments.


s/WORKDIR/Install path? WORKDIR did not makes sense to me.

to clarify, can we substituteWORKDIR as $3 with Install Path as $3?

scripts/install_protoc.sh

scripts/regenerate.sh

arvindbr8 · 2024-05-28T23:45:30Z

scripts/vet-proto.sh

Yup, I see this done as part of this commit 64983a1 (#7064)

scripts/vet-proto.sh

arvindbr8 · 2024-05-28T23:49:45Z

Also this still seems to be not resolved? #7064 (comment)

arvindbr8 · 2024-05-29T23:54:22Z

i would prefer if the reporter of a comment to close the conversation as resolved. The Github UI hides the conversation, and we would need to click on each to see if/what the response is.

arvindbr8

Great! Looks better now. LGTM modulo the comments from this pass.

arvindbr8 · 2024-05-31T23:57:47Z

scripts/install_protoc.sh

+          echo "Existing protoc version ($installed_version) differs. Kindly make sure you have $PROTOC_VERSION installed."
+          exit 1


Suggested change

echo "Existing protoc version ($installed_version) differs. Kindly make sure you have $PROTOC_VERSION installed."

exit 1

die "Existing protoc version ($installed_version) differs. Kindly make sure you have $PROTOC_VERSION installed."

arvindbr8 · 2024-05-31T23:59:27Z

scripts/install_protoc.sh

+      if installed_version=$(protoc --version | cut -d' ' -f2 2>/dev/null); then
+        if [ "$installed_version" = "$PROTOC_VERSION" ]; then
+          echo "protoc version $PROTOC_VERSION is already installed."
+          return


return or exit 0? I'm not sure. How does source react to these different exit?

arvindbr8 · 2024-06-01T00:02:37Z

scripts/vet-proto.sh

+    if [[ "${GITHUB_ACTIONS}" = "true" ]]; then
+      source ./scripts/install_protoc.sh "/home/runner/go"
+    else
+      die "run protoc installer https://github.com/grpc/grpc-go/scripts/install_protoc.sh."


broken link?

also shouldn't we mention how to run the installer from the terminal?

We should also put something in the top level package comment in scripts/install_protoc.sh

also i'm not convinced that only Github Actions should be able to run ./scripts/vet-proto.sh with -install. I would expect that if a user runs this, then we install protoc for them

aranjans force-pushed the aranjans_6583 branch 2 times, most recently from 8bb8747 to af6bc49 Compare March 25, 2024 17:33

dfawley added the Type: Meta Github repo, process, etc label Mar 25, 2024

dfawley added this to the 1.64 Release milestone Mar 25, 2024

dfawley requested a review from arvindbr8 March 25, 2024 17:37

aranjans marked this pull request as ready for review March 25, 2024 17:37

aranjans force-pushed the aranjans_6583 branch 2 times, most recently from e404049 to a582a54 Compare March 26, 2024 06:59

arvindbr8 requested changes Mar 26, 2024

View reviewed changes

vet.sh Outdated Show resolved Hide resolved

regenerate.sh Show resolved Hide resolved

regenerate.sh Outdated Show resolved Hide resolved

arvindbr8 assigned aranjans Mar 26, 2024

aranjans force-pushed the aranjans_6583 branch 12 times, most recently from 20c21cb to a880e4d Compare March 27, 2024 10:00

dfawley assigned arvindbr8 and unassigned aranjans Mar 27, 2024

arvindbr8 requested changes Mar 29, 2024

View reviewed changes

arvindbr8 assigned aranjans and unassigned arvindbr8 Mar 29, 2024

aranjans force-pushed the aranjans_6583 branch 2 times, most recently from 2cddfeb to cc78601 Compare April 1, 2024 06:40

aranjans assigned arvindbr8 and unassigned aranjans May 9, 2024

arvindbr8 removed the stale label May 9, 2024

arvindbr8 assigned aranjans and unassigned arvindbr8 May 9, 2024

arvindbr8 added the Status: Requires Reporter Clarification label May 9, 2024

arvindbr8 modified the milestones: 1.64 Release, 1.65 Release May 9, 2024

github-actions bot added stale and removed stale labels May 15, 2024

aranjans removed the Status: Requires Reporter Clarification label May 16, 2024

aranjans assigned arvindbr8 and unassigned aranjans May 28, 2024

aranjans force-pushed the aranjans_6583 branch from 13f5110 to 64983a1 Compare May 28, 2024 08:24

arvindbr8 requested changes May 28, 2024

View reviewed changes

arvindbr8 assigned aranjans and unassigned arvindbr8 May 28, 2024

arvindbr8 added the Status: Requires Reporter Clarification label May 29, 2024

aranjans force-pushed the aranjans_6583 branch 2 times, most recently from 2baac2d to 32610ba Compare May 30, 2024 07:45

Responded to Arvind's comment

77ac334

aranjans force-pushed the aranjans_6583 branch from 32610ba to 77ac334 Compare May 30, 2024 07:48

aranjans removed the Status: Requires Reporter Clarification label May 30, 2024

arvindbr8 requested changes Jun 1, 2024

View reviewed changes

arvindbr8 added the Status: Requires Reporter Clarification label Jun 1, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

scripts: improve regenerate.sh to use the correct proto compiler version #7064

scripts: improve regenerate.sh to use the correct proto compiler version #7064

aranjans commented Mar 25, 2024 •

edited by dfawley

codecov bot commented Mar 25, 2024 •

edited

arvindbr8 left a comment

arvindbr8 left a comment

aranjans commented May 9, 2024

arvindbr8 commented May 9, 2024

github-actions bot commented May 15, 2024

arvindbr8 May 28, 2024

arvindbr8 May 31, 2024

arvindbr8 May 28, 2024

arvindbr8 commented May 28, 2024 •

edited

arvindbr8 commented May 29, 2024

arvindbr8 left a comment

arvindbr8 May 31, 2024

arvindbr8 May 31, 2024

arvindbr8 Jun 1, 2024

arvindbr8 Jun 1, 2024

arvindbr8 Jun 1, 2024

		echo "Existing protoc version ($installed_version) differs. Kindly make sure you have $PROTOC_VERSION installed."
		exit 1

	echo "Existing protoc version ($installed_version) differs. Kindly make sure you have $PROTOC_VERSION installed."
	exit 1
	die "Existing protoc version ($installed_version) differs. Kindly make sure you have $PROTOC_VERSION installed."

scripts: improve regenerate.sh to use the correct proto compiler version #7064

Are you sure you want to change the base?

scripts: improve regenerate.sh to use the correct proto compiler version #7064

Conversation

aranjans commented Mar 25, 2024 • edited by dfawley

codecov bot commented Mar 25, 2024 • edited

Codecov Report

arvindbr8 left a comment

Choose a reason for hiding this comment

arvindbr8 left a comment

Choose a reason for hiding this comment

aranjans commented May 9, 2024

arvindbr8 commented May 9, 2024

github-actions bot commented May 15, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

arvindbr8 commented May 28, 2024 • edited

arvindbr8 commented May 29, 2024

arvindbr8 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aranjans commented Mar 25, 2024 •

edited by dfawley

codecov bot commented Mar 25, 2024 •

edited

arvindbr8 commented May 28, 2024 •

edited