Skip to content

Commit

Permalink
Updated CISettings.py to use the edk2toolext codeql helpers (#195)
Browse files Browse the repository at this point in the history
## Description

The 202311 rebase moved the codeql plugin from .pytool to Basetools.
This requires a change in CISettings.py to reference the correct codeql
helper functions. Instead of using the internal versions we instead move
to the edk2 pytool extensions version.

- [ ] Impacts functionality?
- **Functionality** - Does the change ultimately impact how firmware
functions?
- Examples: Add a new library, publish a new PPI, update an algorithm,
...
- [ ] Impacts security?
- **Security** - Does the change have a direct security impact on an
application,
    flow, or firmware?
  - Examples: Crypto algorithm change, buffer overflow fix, parameter
    validation improvement, ...
- [ ] Breaking change?
- **Breaking change** - Will anyone consuming this change experience a
break
    in build or boot behavior?
- Examples: Add a new library class, move a module to a different repo,
call
    a function in a new library class in a pre-existing module, ...
- [x] Includes tests?
  - **Tests** - Does the change include any explicit test code?
  - Examples: Unit tests, integration tests, robot tests, ...
- [ ] Includes documentation?
- **Documentation** - Does the change contain explicit documentation
additions
    outside direct code modifications (and comments)?
- Examples: Update readme file, add feature readme file, link to
documentation
    on an a separate Web page, ...

## How This Was Tested

Tested with CI.

## Integration Instructions

N/A
  • Loading branch information
kenlautner authored Jan 25, 2024
1 parent f50dd0e commit e3e3a07
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 305 deletions.
297 changes: 0 additions & 297 deletions .github/workflows/codeql.yml

This file was deleted.

9 changes: 1 addition & 8 deletions .pytool/CISettings.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,7 @@
from edk2toollib.utility_functions import GetHostInfo
from pathlib import Path

try:
# May not be present until submodules are populated
root = Path(__file__).parent.resolve()
sys.path.append(str(root/'Plugin'/'CodeQL'/'integration'))
import stuart_codeql as codeql_helpers
except ImportError:
pass

from edk2toolext import codeql as codeql_helpers

# MU_CHANGE - Add CiSetupSettingsManager superclass.
class Settings(CiSetupSettingsManager, CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManager, PrEvalSettingsManager):
Expand Down

0 comments on commit e3e3a07

Please sign in to comment.