Skip to content

Commit f90c0da

Browse files
committed
ci: Simplify CodeQL setup
The workflow is now warning that `CODEQL_PYTHON` should not be set, as it is no longer used. According to the message, we also don't need to install dependencies, so fold everything into the 'build-for-C++' step.
1 parent 3ad0bc5 commit f90c0da

File tree

1 file changed

+4
-22
lines changed

1 file changed

+4
-22
lines changed

.github/workflows/codeql-analysis.yml

+4-22
Original file line numberDiff line numberDiff line change
@@ -22,41 +22,23 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
language: ['cpp', 'javascript', 'python']
25+
language: ['c-cpp', 'javascript', 'python']
2626

2727
steps:
2828
- name: Checkout repository
2929
uses: actions/checkout@v4
3030

31-
- name: Set up Python
32-
uses: actions/setup-python@v5
33-
if: matrix.language != 'javascript'
34-
with:
35-
python-version: '3.x'
36-
- name: Install dependencies
37-
if: matrix.language != 'javascript'
38-
run: |
39-
python -m pip install --upgrade pip setuptools wheel
40-
# TODO: Use pip-tools instead when it supports build-system
41-
# dependencies so we don't need another copy here.
42-
# https://github.com/jazzband/pip-tools/pull/1681
43-
python -m pip install --upgrade \
44-
build contourpy cycler fonttools kiwisolver \
45-
importlib_resources meson-python numpy packaging pillow pybind11 \
46-
pyparsing python-dateutil setuptools-scm
47-
echo "CODEQL_PYTHON=$(which python)" >> $GITHUB_ENV
48-
4931
- name: Initialize CodeQL
5032
uses: github/codeql-action/init@v3
5133
with:
5234
languages: ${{ matrix.language }}
5335
setup-python-dependencies: false
5436

5537
- name: Build compiled code
56-
if: matrix.language == 'cpp'
38+
if: matrix.language == 'c-cpp'
5739
run: |
58-
mkdir ~/.cache/matplotlib
59-
$CODEQL_PYTHON -m build
40+
pip install --user --upgrade pip
41+
pip install --user -v .
6042
6143
- name: Perform CodeQL Analysis
6244
uses: github/codeql-action/analyze@v3

0 commit comments

Comments
 (0)