Skip to content

Commit 526a8ef

Browse files
jeongsoolee09jeongsoolee09
authored
Merge branch 'main' into jeongsoolee09/debug-remoteflowsources-properties
2 parents bb0fd86 + adffbe9 commit 526a8ef

File tree

12 files changed

+239
-128
lines changed

12 files changed

+239
-128
lines changed

‎.github/workflows/update-codeql.yml

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
name: "Update the CodeQL CLI dependencies"
2+
3+
on:
4+
workflow_dispatch:
5+
# nightly runs to update the CodeQL CLI dependencies
6+
schedule:
7+
- cron: '30 0 * * *'
8+
9+
permissions:
10+
contents: write
11+
pull-requests: write
12+
13+
jobs:
14+
update-codeql:
15+
name: Update CodeQL CLI dependencies
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- name: Checkout repository
20+
uses: actions/checkout@v4
21+
22+
- name: Check latest CodeQL CLI version and update qlt.conf.json
23+
id: check-version
24+
env:
25+
GH_TOKEN: ${{ github.token }}
26+
run: |
27+
echo "Checking latest CodeQL CLI version"
28+
current_version=$(jq .CodeQLCLI qlt.conf.json -r)
29+
latest_version=$(gh release list --repo github/codeql-cli-binaries --json 'tagName,isLatest' --jq '.[] | select(.isLatest == true) | .tagName')
30+
echo "Current CodeQL CLI version: $current_version"
31+
echo "Latest CodeQL CLI version: $latest_version"
32+
33+
# Remove 'v' prefix if present for comparison with current version
34+
latest_clean=$(echo "$latest_version" | sed 's/^v//')
35+
36+
if [ "$latest_clean" != "$current_version" ]; then
37+
echo "Updating CodeQL CLI from $current_version to $latest_clean"
38+
echo "update_needed=true" >> $GITHUB_OUTPUT
39+
echo "latest_version=$latest_clean" >> $GITHUB_OUTPUT
40+
echo "latest_version_tag=$latest_version" >> $GITHUB_OUTPUT
41+
42+
# Update qlt.conf.json with all properties
43+
echo "Updating qlt.conf.json with all properties for version $latest_clean"
44+
jq --arg cli_version "$latest_clean" \
45+
--arg std_lib "codeql-cli/$latest_version" \
46+
--arg bundle "codeql-bundle-$latest_version" \
47+
'.CodeQLCLI = $cli_version | .CodeQLStandardLibrary = $std_lib | .CodeQLCLIBundle = $bundle' \
48+
qlt.conf.json > qlt.conf.json.tmp && mv qlt.conf.json.tmp qlt.conf.json
49+
50+
echo "Updated qlt.conf.json contents:"
51+
cat qlt.conf.json
52+
else
53+
echo "CodeQL CLI is already up-to-date at version $current_version."
54+
echo "update_needed=false" >> $GITHUB_OUTPUT
55+
fi
56+
57+
- name: Install QLT
58+
if: steps.check-version.outputs.update_needed == 'true'
59+
id: install-qlt
60+
uses: advanced-security/codeql-development-toolkit/.github/actions/install-qlt@main
61+
with:
62+
qlt-version: 'latest'
63+
add-to-path: true
64+
65+
- name: Install CodeQL
66+
if: steps.check-version.outputs.update_needed == 'true'
67+
id: install-codeql
68+
shell: bash
69+
run: |
70+
echo "Installing CodeQL"
71+
qlt codeql run install
72+
echo "-----------------------------"
73+
echo "CodeQL Home: $QLT_CODEQL_HOME"
74+
echo "CodeQL Binary: $QLT_CODEQL_PATH"
75+
76+
- name: Upgrade CodeQL pack lock files
77+
if: steps.check-version.outputs.update_needed == 'true'
78+
shell: bash
79+
run: |
80+
echo "Upgrading CodeQL pack lock files"
81+
echo "Finding all directories with qlpack.yml files..."
82+
83+
# Find all directories containing qlpack.yml files
84+
find . -name "qlpack.yml" -type f | while read -r qlpack_file; do
85+
pack_dir=$(dirname "$qlpack_file")
86+
echo "Upgrading pack in directory: $pack_dir"
87+
88+
# Change to the directory and run codeql pack upgrade
89+
cd "$pack_dir"
90+
$QLT_CODEQL_PATH pack upgrade
91+
cd - > /dev/null
92+
done
93+
94+
echo "Finished upgrading all CodeQL pack lock files"
95+
96+
- name: Create Pull Request
97+
if: steps.check-version.outputs.update_needed == 'true'
98+
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
99+
with:
100+
title: "Upgrade CodeQL CLI dependency to ${{ steps.check-version.outputs.latest_version_tag }}"
101+
body: |
102+
This PR upgrades the CodeQL CLI version to ${{ steps.check-version.outputs.latest_version_tag }}.
103+
104+
**Changes made:**
105+
- Updated `CodeQLCLI` to `${{ steps.check-version.outputs.latest_version }}`
106+
- Updated `CodeQLStandardLibrary` to `codeql-cli/${{ steps.check-version.outputs.latest_version_tag }}`
107+
- Updated `CodeQLCLIBundle` to `codeql-bundle-${{ steps.check-version.outputs.latest_version_tag }}`
108+
- Upgraded all CodeQL pack lock files using `codeql pack upgrade`
109+
commit-message: "Upgrade CodeQL CLI dependency to ${{ steps.check-version.outputs.latest_version_tag }}"
110+
delete-branch: true
111+
branch: "codeql/upgrade-to-${{ steps.check-version.outputs.latest_version_tag }}"

‎javascript/frameworks/cap/lib/codeql-pack.lock.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/concepts:
5-
version: 0.0.1
5+
version: 0.0.2
66
codeql/dataflow:
7-
version: 2.0.11
7+
version: 2.0.12
88
codeql/javascript-all:
9-
version: 2.6.7
9+
version: 2.6.8
1010
codeql/mad:
11-
version: 1.0.27
11+
version: 1.0.28
1212
codeql/regex:
13-
version: 1.0.27
13+
version: 1.0.28
1414
codeql/ssa:
15-
version: 2.0.3
15+
version: 2.0.4
1616
codeql/threat-models:
17-
version: 1.0.27
17+
version: 1.0.28
1818
codeql/tutorial:
19-
version: 1.0.27
19+
version: 1.0.28
2020
codeql/typetracking:
21-
version: 2.0.11
21+
version: 2.0.12
2222
codeql/util:
23-
version: 2.0.14
23+
version: 2.0.15
2424
codeql/xml:
25-
version: 1.0.27
25+
version: 1.0.28
2626
codeql/yaml:
27-
version: 1.0.27
27+
version: 1.0.28
2828
compiled: false

‎javascript/frameworks/cap/src/codeql-pack.lock.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/concepts:
5-
version: 0.0.1
5+
version: 0.0.2
66
codeql/dataflow:
7-
version: 2.0.11
7+
version: 2.0.12
88
codeql/javascript-all:
9-
version: 2.6.7
9+
version: 2.6.8
1010
codeql/mad:
11-
version: 1.0.27
11+
version: 1.0.28
1212
codeql/regex:
13-
version: 1.0.27
13+
version: 1.0.28
1414
codeql/ssa:
15-
version: 2.0.3
15+
version: 2.0.4
1616
codeql/threat-models:
17-
version: 1.0.27
17+
version: 1.0.28
1818
codeql/tutorial:
19-
version: 1.0.27
19+
version: 1.0.28
2020
codeql/typetracking:
21-
version: 2.0.11
21+
version: 2.0.12
2222
codeql/util:
23-
version: 2.0.14
23+
version: 2.0.15
2424
codeql/xml:
25-
version: 1.0.27
25+
version: 1.0.28
2626
codeql/yaml:
27-
version: 1.0.27
27+
version: 1.0.28
2828
compiled: false

‎javascript/frameworks/cap/test/codeql-pack.lock.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/concepts:
5-
version: 0.0.1
5+
version: 0.0.2
66
codeql/dataflow:
7-
version: 2.0.11
7+
version: 2.0.12
88
codeql/javascript-all:
9-
version: 2.6.7
9+
version: 2.6.8
1010
codeql/mad:
11-
version: 1.0.27
11+
version: 1.0.28
1212
codeql/regex:
13-
version: 1.0.27
13+
version: 1.0.28
1414
codeql/ssa:
15-
version: 2.0.3
15+
version: 2.0.4
1616
codeql/threat-models:
17-
version: 1.0.27
17+
version: 1.0.28
1818
codeql/tutorial:
19-
version: 1.0.27
19+
version: 1.0.28
2020
codeql/typetracking:
21-
version: 2.0.11
21+
version: 2.0.12
2222
codeql/util:
23-
version: 2.0.14
23+
version: 2.0.15
2424
codeql/xml:
25-
version: 1.0.27
25+
version: 1.0.28
2626
codeql/yaml:
27-
version: 1.0.27
27+
version: 1.0.28
2828
compiled: false

‎javascript/frameworks/ui5/lib/codeql-pack.lock.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/concepts:
5-
version: 0.0.1
5+
version: 0.0.2
66
codeql/dataflow:
7-
version: 2.0.11
7+
version: 2.0.12
88
codeql/javascript-all:
9-
version: 2.6.7
9+
version: 2.6.8
1010
codeql/mad:
11-
version: 1.0.27
11+
version: 1.0.28
1212
codeql/regex:
13-
version: 1.0.27
13+
version: 1.0.28
1414
codeql/ssa:
15-
version: 2.0.3
15+
version: 2.0.4
1616
codeql/threat-models:
17-
version: 1.0.27
17+
version: 1.0.28
1818
codeql/tutorial:
19-
version: 1.0.27
19+
version: 1.0.28
2020
codeql/typetracking:
21-
version: 2.0.11
21+
version: 2.0.12
2222
codeql/util:
23-
version: 2.0.14
23+
version: 2.0.15
2424
codeql/xml:
25-
version: 1.0.27
25+
version: 1.0.28
2626
codeql/yaml:
27-
version: 1.0.27
27+
version: 1.0.28
2828
compiled: false

‎javascript/frameworks/ui5/src/codeql-pack.lock.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/concepts:
5-
version: 0.0.1
5+
version: 0.0.2
66
codeql/dataflow:
7-
version: 2.0.11
7+
version: 2.0.12
88
codeql/javascript-all:
9-
version: 2.6.7
9+
version: 2.6.8
1010
codeql/mad:
11-
version: 1.0.27
11+
version: 1.0.28
1212
codeql/regex:
13-
version: 1.0.27
13+
version: 1.0.28
1414
codeql/ssa:
15-
version: 2.0.3
15+
version: 2.0.4
1616
codeql/threat-models:
17-
version: 1.0.27
17+
version: 1.0.28
1818
codeql/tutorial:
19-
version: 1.0.27
19+
version: 1.0.28
2020
codeql/typetracking:
21-
version: 2.0.11
21+
version: 2.0.12
2222
codeql/util:
23-
version: 2.0.14
23+
version: 2.0.15
2424
codeql/xml:
25-
version: 1.0.27
25+
version: 1.0.28
2626
codeql/yaml:
27-
version: 1.0.27
27+
version: 1.0.28
2828
compiled: false

‎javascript/frameworks/ui5/test/codeql-pack.lock.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,33 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/concepts:
5-
version: 0.0.1
5+
version: 0.0.2
66
codeql/dataflow:
7-
version: 2.0.11
7+
version: 2.0.12
88
codeql/javascript-all:
9-
version: 2.6.7
9+
version: 2.6.8
1010
codeql/javascript-queries:
11-
version: 2.0.0
11+
version: 2.0.1
1212
codeql/mad:
13-
version: 1.0.27
13+
version: 1.0.28
1414
codeql/regex:
15-
version: 1.0.27
15+
version: 1.0.28
1616
codeql/ssa:
17-
version: 2.0.3
17+
version: 2.0.4
1818
codeql/suite-helpers:
19-
version: 1.0.27
19+
version: 1.0.28
2020
codeql/threat-models:
21-
version: 1.0.27
21+
version: 1.0.28
2222
codeql/tutorial:
23-
version: 1.0.27
23+
version: 1.0.28
2424
codeql/typetracking:
25-
version: 2.0.11
25+
version: 2.0.12
2626
codeql/typos:
27-
version: 1.0.27
27+
version: 1.0.28
2828
codeql/util:
29-
version: 2.0.14
29+
version: 2.0.15
3030
codeql/xml:
31-
version: 1.0.27
31+
version: 1.0.28
3232
codeql/yaml:
33-
version: 1.0.27
33+
version: 1.0.28
3434
compiled: false

0 commit comments

Comments
 (0)