Sitelet https://web.archive.org/web/20260814203633/https://github.com/github/codeql/pull/11760
Skip to content

C#/Java: Move the modelgenerator. - #11760

Merged
michaelnebel merged 3 commits into
github:mainfrom
michaelnebel:movemodelgenerator
Jan 11, 2023
Merged

C#/Java: Move the modelgenerator.#11760
michaelnebel merged 3 commits into
github:mainfrom
michaelnebel:movemodelgenerator

Conversation

@michaelnebel

Copy link
Copy Markdown
Contributor

It turns out that we might need to reference some of the libraries and queries in the model generator directory, which is not possible when the directory name contains a dash.
In this PR we remove the dash from the model generator directory name and also adjust workflows, query names and tags accordingly.
A separate PR for DCA is also needed.

@michaelnebel

Copy link
Copy Markdown
Contributor Author

It is expected that the Models as Data - Diff workflows fails at it is not compatible with moving around the related scripts.

@michaelnebel

Copy link
Copy Markdown
Contributor Author

DCA looks good.

@michaelnebel michaelnebel added the no-change-note-required This PR does not need a change note label Jan 3, 2023
@michaelnebel
michaelnebel marked this pull request as ready for review January 3, 2023 13:05
@michaelnebel
michaelnebel requested review from a team as code owners January 3, 2023 13:05
aeisenberg
aeisenberg previously approved these changes Jan 4, 2023

@aeisenberg aeisenberg left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM from the CLI and CI side. Reviews from at least one of the language teams would be good as well.

It looks like the CI failures are due to flaky network requests. And please be sure to notify relevant people regarding query id changes (which I think you have).

@michaelnebel

michaelnebel commented Jan 5, 2023 •

Copy link
Copy Markdown
Contributor Author

LGTM from the CLI and CI side. Reviews from at least one of the language teams would be good as well.

It looks like the CI failures are due to flaky network requests. And please be sure to notify relevant people regarding query id changes (which I think you have).

Thank you for the review!
Yes, there is a another open PR that changes more query IDs and it is being discussed in the Code Scanning Team slack channel.
The queries that changes id are only related to Telemetry.

atorralba
atorralba previously approved these changes Jan 9, 2023

@atorralba atorralba left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Java looks plausible to me.

@michaelnebel

Copy link
Copy Markdown
Contributor Author

I had to do a rebase, which didn't cause any real changes.
@atorralba : Can you rubberstamp the changes again?

atorralba
atorralba previously approved these changes Jan 10, 2023
sidshank
sidshank previously approved these changes Jan 11, 2023

@sidshank sidshank left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM. I spent some time looking for import paths or directories constructed using string concatenation, that might have been missed, but found nothing.

@michaelnebel
michaelnebel dismissed stale reviews from sidshank and atorralba via 11ca3f4 January 11, 2023 12:17
@michaelnebel

Copy link
Copy Markdown
Contributor Author

@atorralba or @tamasvajk : Sorry to bother you again, but I needed to rebase once more (was not able to merge yesterday due to issues with actions timeout). There are no changes since last time. Could one of you please rubber stamp the PR again?

@atorralba atorralba left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Done 😃

@michaelnebel
michaelnebel merged commit 4b47b08 into github:main Jan 11, 2023
@michaelnebel
michaelnebel deleted the movemodelgenerator branch January 11, 2023 15:02
@michaelnebel
michaelnebel restored the movemodelgenerator branch January 12, 2023 08:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

C# Java no-change-note-required This PR does not need a change note

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants