Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: update antlr version #4555

Merged
merged 14 commits into from
Oct 4, 2024
Merged

Conversation

oncilla
Copy link
Contributor

@oncilla oncilla commented Jun 26, 2024

NO_CHANGELOG

@oncilla oncilla requested a review from matzf June 26, 2024 13:17
@oncilla oncilla requested a review from lukedirtwalker as a code owner June 26, 2024 13:17
@jiceatscion
Copy link
Contributor

This change is Reviewable

Copy link
Collaborator

@lukedirtwalker lukedirtwalker left a comment

Choose a reason for hiding this comment

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

Reviewed 19 of 20 files at r1, 1 of 1 files at r2, all commit messages.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @matzf and @oncilla)


nogo.json line 72 at r2 (raw file):

            "antlr": "",
            "gazelle/pathtools/path.go": "",
            "/com_github_antlr_antlr4_runtime_go_antlr/": "",

can this be removed then?


nogo.json line 228 at r2 (raw file):

        }
    }
}

add newline?


WORKSPACE line 60 at r2 (raw file):

go_register_toolchains(
    nogo = "@//:nogo",
    version = "1.21.11",

shouldn't that match the version in go.mod?

Copy link
Contributor

@matzf matzf left a comment

Choose a reason for hiding this comment

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

Reviewed 19 of 20 files at r1, 1 of 1 files at r2, all commit messages.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @lukedirtwalker and @oncilla)


WORKSPACE line 60 at r2 (raw file):

Previously, lukedirtwalker (Lukas Vogel) wrote…

shouldn't that match the version in go.mod?

If we don't want to bump our go version as a side effect of this, note that antlr-go 4.13.0 seems to be compatible with go 1.21, and judging from the diff between these versions, there is nothing too important that we'd miss.
I don't understand why they bumped the go version...

Note: the version of antlr-go is not the same thing as the thing loaded by rules_antrl_dependencies("4.13.1") -- the version numbers are similar, but apparently not directly related.

Copy link
Collaborator

@lukedirtwalker lukedirtwalker left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @oncilla)

@jiceatscion
Copy link
Contributor

We can upgrade Go anyway. See #4603

jiceatscion added a commit that referenced this pull request Aug 28, 2024
This required upgrading rules_go to 0.47.0 because of some magic
parameter that must now be passed to the go assembler in support of the
internal/V0 ABI split in go 1.22.

It wasn't possible to upgrade rules_go further without also upgrading
bazel and other stuff. So... one problem at a time.

As a result of rules_go upgrade, the proto generation has changed, hence
the other diffs.

Contributes to #4555
@jiceatscion
Copy link
Contributor

Go has been updated. This should be good to go in.

@jiceatscion
Copy link
Contributor

@oncilla Are you not going to merge this?

@oncilla
Copy link
Contributor Author

oncilla commented Oct 4, 2024

@jiceatscion it is currently very low on my priority list. I do not have time to spend on this.
Feel free to take it over if you want this to be in soon.

Copy link
Contributor

@jiceatscion jiceatscion left a comment

Choose a reason for hiding this comment

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

will merge it if straighforward.

Reviewed 6 of 7 files at r3, all commit messages.
Reviewable status: 19 of 20 files reviewed, 2 unresolved discussions (waiting on @lukedirtwalker, @matzf, and @oncilla)

Copy link
Collaborator

@lukedirtwalker lukedirtwalker left a comment

Choose a reason for hiding this comment

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

Reviewed 6 of 7 files at r3, 3 of 3 files at r5, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @oncilla)

Copy link
Contributor

@jiceatscion jiceatscion left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 2 files at r4, all commit messages.
Reviewable status: 20 of 21 files reviewed, all discussions resolved (waiting on @lukedirtwalker and @matzf)


nogo.json line 228 at r2 (raw file):

Previously, lukedirtwalker (Lukas Vogel) wrote…

add newline?

done

Copy link
Collaborator

@lukedirtwalker lukedirtwalker left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 1 of 1 files at r7, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @oncilla)

Copy link
Collaborator

@lukedirtwalker lukedirtwalker left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @oncilla)

Copy link
Contributor

@jiceatscion jiceatscion left a comment

Choose a reason for hiding this comment

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

Reviewed 4 of 4 files at r8, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @oncilla)

Copy link
Contributor

@jiceatscion jiceatscion left a comment

Choose a reason for hiding this comment

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

Thanks for standing by. For the record, I did self-approve my fixes to the lint issues.

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @oncilla)

@jiceatscion jiceatscion merged commit aa917bb into scionproto:master Oct 4, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants