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 releases/v3 into releases/v2 #2424

Merged
merged 39 commits into from
Aug 14, 2024
Merged

Merge releases/v3 into releases/v2 #2424

merged 39 commits into from
Aug 14, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Aug 13, 2024 •
edited by rvermeulen
Loading

Merging 29d86d2 into releases/v2.

Conductor for this PR is @rvermeulen.

Contains the following pull requests:

Please do the following:

  • Ensure the CHANGELOG displays the correct version and date.
  • Ensure the CHANGELOG includes all relevant, user-facing changes since the last release.
  • Check that there are not any unexpected commits being merged into the releases/v2 branch.
  • Ensure the docs team is aware of any documentation changes that need to be released.
  • Remove and re-add the "Update dependencies" label to the PR to trigger just this workflow.
  • Wait for the "Update dependencies" workflow to push a commit updating the dependencies.
  • Mark the PR as ready for review to trigger the full set of PR checks.
  • Approve and merge this PR. Make sure Create a merge commit is selected rather than Squash and merge or Rebase and merge.

rvermeulen and others added 30 commits July 26, 2024 16:32
@rvermeulen
Add packs to init complete status report
a6c4760 
To support both the single language and multi language case we turn
the single language case into a multi language case using the
configured language.
The entire packs record is then stored as a stringified JSON object.
@rvermeulen
Add query-filters to the init complete status report
25d2596
@rvermeulen
Add registries to the init status complete report
9f7e0af 
Registries might require authentication, before we add it to the
report we remove any credentials.
@rvermeulen
Reword comment
060c11b
@rvermeulen
Address formatting issues
7ff117d
@rvermeulen
Change removal of credentials to adhere to no-vars-unused
b7b85bb
@rvermeulen
Update map and minified JS files
19a1da5
@rvermeulen
Move cloneObject into utilities and export it.
7be3a64
@rvermeulen
Clone packs from configuration to prevent modifications
ba3ac6f
@rvermeulen
Explicitly set value of registries and query_filters when undefined
e6c9383 
Both are arrays, so we will use an empty array if they are undefined.
@rvermeulen
Merge branch 'main' into rvermeulen/extend-init-complete-status-report
0f24d46 
Signed-off-by: Remco Vermeulen <rvermeulen@github.com>
@rvermeulen
Merge remote-tracking branch 'upstream/main' into rvermeulen/extend-i…
7c2bec0 
…nit-complete-status-report
@github-actions
Update changelog and version after v3.26.0
1c5b392
@henrymercer
Required checks script: Ignore skipped jobs
ecf4658
@github-actions
Update checked-in dependencies
50d1f40
@henrymercer
Merge pull request #2412 from github/henrymercer/update-required-igno…
c056c18 
…re-skipped

Required checks script: Ignore skipped jobs
@henrymercer
Merge pull request #2411 from github/mergeback/v3.26.0-to-main-eb055d73
3ec2588 
Mergeback v3.26.0 refs/heads/releases/v3 into main
@rvermeulen
Merge branch 'main' into rvermeulen/extend-init-complete-status-report
a8ab493
@rvermeulen
Merge pull request #2394 from rvermeulen/rvermeulen/extend-init-compl…
5c02493 
…ete-status-report

Extend init complete status report
@henrymercer
Add details of supported versions for GHES 3.14
6ef274e 
The release candidate is [now out](https://github.blog/changelog/2024-08-07-the-github-enterprise-server-3-14-release-candidate-is-available/).
@henrymercer
Improve consistency in supported version naming
def1e35
@github-actions
Update default bundle to codeql-bundle-v2.18.2
18c419e
@github-actions
Add changelog note
5d9950f
@henrymercer
Add telemetry for time spent extracting CodeQL bundle
50357f5
@henrymercer
Fix matrixing of "submit SARIF after failure" check
44ecae4
@henrymercer
Merge pull request #2418 from github/henrymercer/extraction-time-tele…
25ad3c8 
…metry

Add telemetry for time spent extracting CodeQL bundle
@dependabot @github-actions
Bump the npm group with 4 updates (#2419)
d620faa 
* Bump the npm group with 4 updates

Bumps the npm group with 4 updates: [adm-zip](https://github.com/cthackers/adm-zip), [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js), [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser).


Updates `adm-zip` from 0.5.14 to 0.5.15
- [Release notes](https://github.com/cthackers/adm-zip/releases)
- [Changelog](https://github.com/cthackers/adm-zip/blob/master/history.md)
- [Commits](cthackers/adm-zip@v0.5.14...v0.5.15)

Updates `@eslint/js` from 9.8.0 to 9.9.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/commits/v9.9.0/packages/js)

Updates `@typescript-eslint/eslint-plugin` from 8.0.1 to 8.1.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.1.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 8.0.1 to 8.1.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.1.0/packages/parser)

---
updated-dependencies:
- dependency-name: adm-zip
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: npm
- dependency-name: "@eslint/js"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update checked-in dependencies

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@henrymercer
Log job run UUID
41833c7
@alexet
Merge pull request #2417 from github/update-bundle/codeql-bundle-v2.18.2
c4c3c44 
Update default bundle to 2.18.2
@henrymercer
Merge pull request #2421 from github/henrymercer/log-job-run-uuid
da9ecb0 
Log job run UUID
henrymercer and others added 8 commits August 13, 2024 15:45
@github-actions github-actions bot added the Update dependencies Trigger PR workflow to update dependencies label Aug 13, 2024
@rvermeulen rvermeulen marked this pull request as ready for review August 13, 2024 20:57
@rvermeulen rvermeulen requested a review from a team as a code owner August 13, 2024 20:57
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Aug 13, 2024
@github-actions GitHub Actions
Copy link
Contributor Author

Pushed a commit to update the checked-in dependencies. Please mark the PR as ready for review to trigger PR checks.

@github-actions github-actions bot marked this pull request as draft August 13, 2024 20:58
@aeisenberg aeisenberg marked this pull request as ready for review August 13, 2024 21:15
@aeisenberg aeisenberg enabled auto-merge August 13, 2024 21:15
auto-merge was automatically disabled August 13, 2024 21:18

Pull Request is not mergeable

@henrymercer henrymercer merged commit 404b712 into releases/v2 Aug 14, 2024
304 checks passed
@henrymercer henrymercer deleted the backport-v2.26.1-29d86d22a branch August 14, 2024 14:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aeisenberg aeisenberg aeisenberg approved these changes

Assignees

@rvermeulen rvermeulen

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@aeisenberg @rvermeulen @henrymercer @alexet