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

Jump to bottom

Merge rc/3.4 into main #7739

Merged
merged 13 commits into from Jan 25, 2022
Merged

Merge rc/3.4 into main #7739

merged 13 commits into from Jan 25, 2022

Conversation

@edoardopirovano
Copy link
Contributor

@edoardopirovano edoardopirovano commented Jan 25, 2022

Merges back the rc/3.4 branch into main.
felicitymay and others added 12 commits Jan 14, 2022
@felicitymay
Update version numbers for LGTM 1.29
fdf77ad
@felicitymay
Add note and link to main CodeQL CLI docs
e7dde79
@felicitymay
FIx typo in new note
e0110bd
@felicitymay
Merge pull request #7604 from github/lgtm-1.29-docs
c3ed74d 
Update version numbers in CodeQL support notes for LGTM 1.29
@felicitymay
Port changes from main to rc/3.3 to avoid regression
51e8b4c
Release preparation for version 2.7.6
4ce8ccc
@hvitved
Merge pull request #7667 from github/release-prep/2.7.6
a1cdf25 
Release preparation for version 2.7.6
@felicitymay
Merge pull request #7653 from github/felicitymay-patch-1
e178626 
Port changes from main to rc/3.3 to avoid regression
Post-release preparation for codeql-cli-2.7.6
ab21842
@adityasharad
Merge rc/3.3 into rc/3.4
ccc6291 
Conflicts in *-support.rst resolved in favour of rc/3.3, which has a new paragraph.
Enterprise version numbers updated to LGTM Enterprise 1.30 and CodeQL 2.7.6.
@adityasharad
Merge pull request #7685 from adityasharad/merge/3.3-3.4
67e3f5e 
Merge rc/3.3 into rc/3.4
@edoardopirovano
Merge pull request #7673 from github/post-release-prep/codeql-cli-2.7.6
413c0a8 
Post-release preparation for codeql-cli-2.7.6
@edoardopirovano edoardopirovano requested a review from dbartol Jan 25, 2022
@edoardopirovano edoardopirovano requested review from as code owners Jan 25, 2022
aeisenberg
aeisenberg requested changes Jan 25, 2022
View changes
Copy link
Contributor

@aeisenberg aeisenberg left a comment

Somehow there are some upgrades files that have been back ported. These should be removed. Also, some of the solorigate files as well.

.codeqlmanifest.json Outdated Show resolved Hide resolved
cpp/upgrades/CHANGELOG.md Outdated Show resolved Hide resolved
csharp/ql/campaigns/Solorigate/lib/change-notes/released/0.0.7.md Outdated Show resolved Hide resolved
csharp/ql/campaigns/Solorigate/test/change-notes/released/0.0.8.md Outdated Show resolved Hide resolved
java/upgrades/CHANGELOG.md Outdated Show resolved Hide resolved
@edoardopirovano edoardopirovano force-pushed the edoardo/3.4-mergeback branch 2 times, most recently from abf0eed to 62ebcf5 Jan 25, 2022
@edoardopirovano edoardopirovano force-pushed the edoardo/3.4-mergeback branch from 62ebcf5 to 1b539eb Jan 25, 2022
@edoardopirovano
Copy link
Contributor Author

@edoardopirovano edoardopirovano commented Jan 25, 2022

Thanks @aeisenberg, looks like I incorrectly resolved the merge conflict with #7355 in favour of the RC branch instead of main. I've amended the merge commit to resolve in favour of main instead. Is it looking correct now?

aeisenberg
aeisenberg approved these changes Jan 25, 2022
View changes
Copy link
Contributor

@aeisenberg aeisenberg left a comment

Looks good now.

@edoardopirovano edoardopirovano merged commit 662675e into main Jan 25, 2022
39 checks passed
@edoardopirovano edoardopirovano deleted the edoardo/3.4-mergeback branch Jan 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aeisenberg aeisenberg

@dbartol dbartol

@github/codeql-c-analysis codeql-c-analysis

@github/codeql-csharp codeql-csharp

@github/codeql-java codeql-java

@github/codeql-javascript codeql-javascript

@github/codeql-python codeql-python

@github/codeql-ruby codeql-ruby

Assignees
No one assigned
Labels
C# C++ documentation Java JS Python Ruby
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet
5 participants
@edoardopirovano @aeisenberg @felicitymay @hvitved @adityasharad