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.

Sign up for GitHub

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 main into v1 #729

Merged
merged 42 commits into from
Sep 6, 2021
Merged

Merge main into v1 #729

merged 42 commits into from
Sep 6, 2021

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Sep 6, 2021 •
edited by edoardopirovano

Merging 4455bf8 into v1

Conductor for this PR is @adityasharad

Contains the following pull requests:

Please review the following:

  • The CHANGELOG displays the correct version and date.
  • The CHANGELOG includes all relevant, user-facing changes since the last release.
  • There are no unexpected commits being merged into the v1 branch.
  • The docs team is aware of any documentation changes that need to be released.
  • The mergeback PR is merged back into main after this PR is merged.

github-actions[bot] and others added 30 commits August 16, 2021 09:20
Update changelog and version after v1.0.12
78cda05
1.0.13
2eb8300
Update checked-in dependencies
e86cff2
@edoardopirovano
Merge pull request #705 from github/mergeback/v1.0.12-to-main-b0e70410
2639547 
Mergeback v1.0.12 refs/heads/v1 into main
@dependabot
Bump webpack from 5.48.0 to 5.50.0 in /runner
a2f0227 
Bumps [webpack](https://github.com/webpack/webpack) from 5.48.0 to 5.50.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](webpack/webpack@v5.48.0...v5.50.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@edoardopirovano
Merge pull request #703 from github/dependabot/npm_and_yarn/runner/we…
e3151ae 
…bpack-5.50.0

Bump webpack from 5.48.0 to 5.50.0 in /runner
@mlbo
fix indentation error on README.md
bf91ac9
@edoardopirovano
Merge pull request #706 from iotbo/main
f0a2954 
fix indentation error on README.md
@edoardopirovano
Cache result of codeql version
4ba53e3
@edoardopirovano
Version flag usage of certain CLI flags
fb77829
@edoardopirovano
Enforce a minimum version of CodeQL CLI
70d2efc
@edoardopirovano
Test against oldest supported version
e70ec1d
@edoardopirovano
Address PR comments from @henrymercer
fd45eac
@hmakholm
Update CodeQL bundle to 20210824 / 2.6.0
7208845
@edoardopirovano
Bump version of testing pack
132e08a
@adityasharad
Merge pull request #712 from github/hmakholm/pr/2.6.0
50de2e4 
Update CodeQL bundle to 20210824 / 2.6.0
@henrymercer
Merge branch 'main' into cli-version
a062fc9
@edoardopirovano
Merge pull request #707 from edoardopirovano/cli-version
a44b61d 
Improve handling of CLI versions
@aeisenberg
Add names to all pr-checks
1785bbb
@aeisenberg
Upgrade linguist dependency
b29bf7b 
This version changes how it counts python heredoc. All heredoc is
counted as code.
@edoardopirovano
Remove old baseline LoC injection
2e71e02
@aeisenberg
Merge pull request #714 from github/aeisenberg/update-linguist
e2d592d 
Upgrade linguist dependency
@aeisenberg
Merge branch 'main' into aeisenberg/pr-check-names
8a0c541
@aeisenberg
Update integration test pack versions
e833d6e
@esbena
Fix typo in docstring
1c27c52
@aeisenberg
Merge branch 'main' into remove-old-loc
80a6b3a
@aeisenberg
Try the nightly build for packaging integration tests
d1ff4d6
@aeisenberg
Merge pull request #721 from github/aeisenberg/update-pack-version
c0a5878 
Update integration test pack versions
@aeisenberg
Merge branch 'main' into esbena-patch-2
72399ae
@aeisenberg
Merge branch 'main' into aeisenberg/pr-check-names
2ba7208
aeisenberg and others added 12 commits September 1, 2021 07:27
@edoardopirovano edoardopirovano marked this pull request as ready for review September 6, 2021 09:43
@edoardopirovano edoardopirovano requested a review from a team as a code owner September 6, 2021 09:43
edoardopirovano
edoardopirovano approved these changes Sep 6, 2021
View reviewed changes
Copy link
Contributor

@edoardopirovano edoardopirovano left a comment

Choose a reason for hiding this comment

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

LGTM

@edoardopirovano edoardopirovano merged commit 89d78ba into v1 Sep 6, 2021
@edoardopirovano edoardopirovano deleted the update-v1.0.13-4455bf8c branch September 6, 2021 11:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edoardopirovano edoardopirovano edoardopirovano approved these changes

Assignees

@adityasharad adityasharad

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@edoardopirovano @adityasharad @mlbo @hmakholm @henrymercer @aeisenberg @esbena