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 releases/v2 #1570

Merged
merged 34 commits into from
Mar 10, 2023
Merged

Merge main into releases/v2 #1570

merged 34 commits into from
Mar 10, 2023

Commits on Feb 7, 2023

  1. Ensure qlconfig file is created when config parsing in cli is on 

    Previously, with the config parsing in the cli feature flag turned on,
the CLI was not able to download packs from other registries. This PR
adds the codeql-action changes required for this. The CLI changes will
be in a separate, internal PR.
    @aeisenberg
    aeisenberg committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    bbe8d37 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2023

  1. Merge remote-tracking branch 'upstream/main' into aeisenberg/qlconfig… 

    …-in-cli
    @aeisenberg
    aeisenberg committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    e2f72f1 View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review 

    Co-authored-by: Henry Mercer <henry.mercer@me.com>
    @aeisenberg @henrymercer
    aeisenberg and henrymercer committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    3c81243 View commit details
    Browse the repository at this point in the history

  3. Add tests for generateRegistries with an existing CODEQL_REGISTRIES… 

    …_AUTH
    @aeisenberg
    aeisenberg committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    5492b7d View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2023

  1. Update src/codeql.ts

    @aeisenberg
    aeisenberg committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    736263f View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2023

  1. Update changelog and version after v2.2.5

    github-actions[bot] committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    652709d View commit details
    Browse the repository at this point in the history

  2. Fix workflow to update dependencies 

    Port over the fix from
#1544
and share code so these scripts don't get out of sync again.
    @henrymercer
    henrymercer committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    cf1855a View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2023

  1. Merge branch 'main' into aeisenberg/qlconfig-in-cli

    @aeisenberg
    aeisenberg committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    8f19113 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1549 from github/henrymercer/fix-update-dependencies 

    Fix workflow to update dependencies
    @henrymercer
    henrymercer committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    041757f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into mergeback/v2.2.5-to-main-32dc4993

    @henrymercer
    henrymercer committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    36a249f View commit details
    Browse the repository at this point in the history

  4. Update checked-in dependencies

    github-actions[bot] committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    18ff14b View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1548 from github/mergeback/v2.2.5-to-main-32dc4993 

    Mergeback v2.2.5 refs/heads/releases/v2 into main
    @henrymercer
    henrymercer committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    903be79 View commit details
    Browse the repository at this point in the history

  6. Address comments from PR

    @aeisenberg
    aeisenberg committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    98d24e5 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1527 from github/aeisenberg/qlconfig-in-cli 

    Ensure qlconfig file is created when config parsing in cli is on
    @aeisenberg
    aeisenberg committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    a589d40 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. Update bundle to 2.12.4

    @dbartol
    dbartol committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    e812e63 View commit details
    Browse the repository at this point in the history

  2. Update bundle to 2.12.4

    @dbartol
    dbartol committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    5e4af3a View commit details
    Browse the repository at this point in the history

  3. Avoid writing user-config.yaml file while running tests

    @henrymercer
    henrymercer committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    a6d3a44 View commit details
    Browse the repository at this point in the history

  4. Avoid passing an undefined qlconfig arg

    @henrymercer
    henrymercer committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    100bd7b View commit details
    Browse the repository at this point in the history

  5. Bump setup-swift and re-configure dependabot (#1560) 

    * Update `setup-swift` to v1.22.0

* Configure dependabot to scan `setup-swift` dir

* Add reminder to manually update the SHA in CLI test

* Add comment on new Dependabot directory
    @angelapwen
    angelapwen committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    6f079be View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into dbartol/bundle-2.12.4

    @henrymercer
    henrymercer committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    e5ade42 View commit details
    Browse the repository at this point in the history

  7. Bump glob from 8.0.1 to 9.2.1 

    Bumps [glob](https://github.com/isaacs/node-glob) from 8.0.1 to 9.2.1.
- [Release notes](https://github.com/isaacs/node-glob/releases)
- [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md)
- [Commits](isaacs/node-glob@v8.0.1...v9.2.1)

---
updated-dependencies:
- dependency-name: glob
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    abf1cea View commit details
    Browse the repository at this point in the history

  8. Update checked-in dependencies

    github-actions[bot] committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    7806af3 View commit details
    Browse the repository at this point in the history

  9. Fix name of qlconfig file argument

    @henrymercer
    henrymercer committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    eb40427 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #1563 from github/dependabot/npm_and_yarn/glob-9.2.1 

    Bump glob from 8.0.1 to 9.2.1
    @henrymercer
    henrymercer committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    6ef6e50 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2023

  1. Avoid writing user-config.yaml file while running tests

    @henrymercer @aeisenberg
    henrymercer authored and aeisenberg committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    8340258 View commit details
    Browse the repository at this point in the history

  2. Avoid passing an undefined qlconfig arg

    @henrymercer @aeisenberg
    henrymercer authored and aeisenberg committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    4366485 View commit details
    Browse the repository at this point in the history

  3. Fix name of qlconfig file argument

    @henrymercer @aeisenberg
    henrymercer authored and aeisenberg committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    c310f09 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1564 from github/aeisenberg/qlconfig-file 

    Fix --qlconfig-file option
    @aeisenberg
    aeisenberg committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    e4b846c View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2023

  1. Add default values to feature flags 

    This changes adds default values to feature flags. These default values
will be used whenever the full set of feature flags are not available
(for example on GHES or if the flag request fails).

The goal is to enable cli config parsing on GHES without removing the
feature flag on dotcom.
    @aeisenberg
    aeisenberg committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    0c27d0d View commit details
    Browse the repository at this point in the history

  2. Add security-experimental to codeql-config.yml (#1566)

    @angelapwen
    angelapwen committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    a3cf964 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1567 from github/aeisenberg/config-parsing-ghes 

    Add default values to feature flags
    @aeisenberg
    aeisenberg committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    f13b180 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2023

  1. Merge branch 'main' into dbartol/bundle-2.12.4

    @dbartol
    dbartol committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    d47d4c8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1561 from github/dbartol/bundle-2.12.4 

    Update bundle to 2.12.4
    @dbartol
    dbartol committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    e12a2ec View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2023

  1. Update changelog for v2.2.6

    github-actions[bot] committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    74cbab4 View commit details
    Browse the repository at this point in the history