Skip to content

Commit 2711c9f

Browse files
authored
Fixup codeql runs (#2180)
Summary: There were two issues on main related to codeql. This attempts to address both of them. 1) since go 1.21, the go.mod file is expected to have a version of the form v1.X.Y instead of v1.X codeql warns about this, so this fixes the same. 2) given the recent change in GH action runners, the runners don't seem to have nodejs installed by default, this ensures that nodejs is indeed installed. Relevant Issues: N/A Type of change: /kind bug Test Plan: Tested e2e. Signed-off-by: Vihang Mehta <vihang@px.dev>
1 parent 5f9b1eb commit 2711c9f

File tree

2 files changed

+21
-8
lines changed

2 files changed

+21
-8
lines changed

.github/workflows/codeql.yaml

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,34 @@ jobs:
2727
- uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
2828
with:
2929
category: "/language:go"
30-
analyze:
30+
analyze-python:
3131
runs-on: oracle-8cpu-32gb-x86-64
3232
permissions:
3333
actions: read
3434
contents: read
3535
security-events: write
36-
strategy:
37-
fail-fast: false
38-
matrix:
39-
language: [python, javascript]
4036
steps:
4137
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4238
- uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
4339
with:
44-
languages: ${{ matrix.language }}
40+
languages: python
4541
- uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
4642
with:
47-
category: "/language:${{matrix.language}}"
43+
category: "/language:python"
44+
analyze-javascript:
45+
runs-on: oracle-8cpu-32gb-x86-64
46+
permissions:
47+
actions: read
48+
contents: read
49+
security-events: write
50+
steps:
51+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
52+
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
53+
with:
54+
node-version: 18
55+
- uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
56+
with:
57+
languages: javascript
58+
- uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
59+
with:
60+
category: "/language:javascript"

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module px.dev/pixie
22

3-
go 1.24
3+
go 1.24.0
44

55
require (
66
cloud.google.com/go v0.81.0

0 commit comments

Comments
 (0)