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/v2 into releases/v1 #1377

Merged
merged 55 commits into from Nov 16, 2022
Merged

Merge releases/v2 into releases/v1 #1377

merged 55 commits into from Nov 16, 2022

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Nov 16, 2022 •
edited by marcogario

Merging 678fc3a into releases/v1

Conductor for this PR is @marcogario.

Contains the following pull requests:

Please do the following:

  • Ensure package.json file contains the correct version.
  • Add commits to this branch to resolve the merge conflicts in the following files:
    • package-lock.json
  • Ensure another maintainer has reviewed the additional commits you added to this branch to resolve the merge conflicts.
  • 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/v1 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.

henrymercer and others added 30 commits November 11, 2022 18:00
@henrymercer
Bump minimum version to 2.6.3
b45e925
@henrymercer
Remove flags for CLI v2.6.2 and earlier
ea990a3
@henrymercer
Remove lines of code counting in the Action
84e5134 
We now only need to support doing this in the CLI.
@henrymercer
Fix a couple of naming nits
acbc6ca
@henrymercer
Update autogenerated checks to run on earliest three minor CLI versions
9e44100
@henrymercer
Update CLI versions in non-generated checks
1fd7631
@henrymercer
Add changelog note
e131232
@henrymercer
Update first version of CLI compatible with Windows 2022
0c3e493 
It is 2.8.2, not 2.7.3.
Update changelog and version after v2.1.32
ac90bc0
Update checked-in dependencies
f3e11b9
@henrymercer
Merge pull request #1361 from github/mergeback/v2.1.32-to-main-42384213
af487b1 
Mergeback v2.1.32 refs/heads/releases/v2 into main
@henrymercer
Delete runner CLI config parsing check
be84b68 
This is now covered by `codescanning-config-cli.yml`.
@henrymercer
Remove Windows and macOS JS analysis runner tests
63d8cbe 
These are covered by `codeql.yml`, which runs across all latest runner
images.
@henrymercer
Remove manual build steps tests
83ead45 
These are tested by `multi-language-autodetect.yml`
@henrymercer
Remove runner C# autobuild tests
219d9a0 
These are covered by `autobuild-action.yml`.
@henrymercer
Remove runner upload SARIF test
adb125a 
Testing SARIF compatibility is covered by `codeql.yml`.
@henrymercer
Remove runner threads and RAM test
73c5c06 
We don't need to test runner functionality now since the runner is only
used in PR checks, and `extractor-ram-threads.yml` covers the Action
case.
@henrymercer
Delete the runner
51abddb
@henrymercer
Remove concept of Actions / runner mode
b498c79
@henrymercer
Remove auth method only used in runner
8c8a9b1
@angelapwen @henrymercer
Support Swift for private beta (#1350)
0eacdb5 
Co-authored-by: Henry Mercer <henry.mercer@me.com>
@henrymercer
Remove note about separation in actions-util
03bb58c 
We could move everything into `util`, but in some ways it is nice having
a file dedicated to Actions related utilities.
@henrymercer
Remove runner-only input to databaseInitCluster
3d46406
@henrymercer
Remove support for empty analysis keys from runner
8ecbaea
@henrymercer
Remove deriveApiUrl function only used by runner
dac8912
@henrymercer
Remove unneeded apiDetails input to getApiClient
9df773d
@henrymercer
Update lockfiles to v3
375506c
@angelapwen @henrymercer
Deprecate Go extraction reconciliation feature flag and `CODEQL_EXTRA…
5883c13 
…CTOR_GO_BUILD_TRACING` for custom builds (#1322)

Co-authored-by: Henry Mercer <henry.mercer@me.com>
@henrymercer
Add config file to support npm v8 and v9 simultaneously
47ce159
@henrymercer
Merge branch 'main' into henrymercer/delete-runner-part-1
0990a34
henrymercer and others added 12 commits November 15, 2022 21:19
@henrymercer
Merge pull request #1364 from github/henrymercer/delete-runner-part-2
f8b607e 
Delete the runner, part 2
@marcogario
Prefer GITHUB_REF to CODE_SCANNING_REF
0a76b97 
Given that the GITHUB_REF is a protected variable, we want to prefer it to
CODE_SCANNING_REF. This should prevent accidentally overwriting these values.
The logic is a bit more involved, as I think it makes sense to raise the error
about GITHUB_REF not being set, rather than mentioning CODE_SCANNING_REF if
both are not set.
@angelapwen
Remove Go extraction feature flags (#1371)
7484436
@henrymercer
Merge pull request #1358 from github/henrymercer/require-cli-2.6.3
1935d19 
Bump minimum CodeQL bundle version to 2.6.3
@marcogario
Merge pull request #1372 from github/marcogario/prioritize_github_ref
c939e66 
Prefer GITHUB_REF to CODE_SCANNING_REF
Update changelog for v2.1.33
f2c3e7c
@marcogario
Fix changelog entry
d13b9b8
@marcogario
Merge pull request #1375 from github/update-v2.1.33-c939e661
678fc3a 
Merge main into releases/v2
Revert "Update version and changelog for v1.1.32"
77ca6a3 
This reverts commit b3d9a91.
Revert "Update checked-in dependencies"
2ceabc2 
This reverts commit f71b2a3.
Merge remote-tracking branch 'origin/releases/v2' into update-v1.1.33…
49a3e72 
…-678fc3af

# Conflicts:
#	package-lock.json
Update version and changelog for v1.1.33
9600345
@github-actions github-actions bot added the Update dependencies Trigger PR workflow to update dependencies label Nov 16, 2022
@marcogario marcogario added Update dependencies Trigger PR workflow to update dependencies and removed Update dependencies Trigger PR workflow to update dependencies labels Nov 16, 2022
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Nov 16, 2022
@marcogario marcogario marked this pull request as ready for review November 16, 2022 19:32
@marcogario marcogario requested a review from a team as a code owner November 16, 2022 19:32
@marcogario marcogario merged commit 7311378 into releases/v1 Nov 16, 2022
@marcogario marcogario deleted the update-v1.1.33-678fc3af branch November 16, 2022 20:12
This was referenced Apr 25, 2023
Open
Open
Open
Open
@aliscco aliscco mentioned this pull request Jun 25, 2023
Open
@aliscco aliscco mentioned this pull request Jul 4, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marcogario marcogario marcogario approved these changes

Assignees

@marcogario marcogario

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@marcogario @henrymercer @angelapwen @aeisenberg