@@ -116,23 +116,22 @@ jobs:
116116 chmod +x ./scripts/update-release-version.sh
117117 ./scripts/update-release-version.sh "${TAG_VERSION}"
118118
119- - name : Tag - Install QLT
120- if : steps.needs-creation.outputs.needed == 'true'
121- id : install-qlt
122- uses : advanced-security/codeql-development-toolkit/.github/actions/install-qlt@main
123- with :
124- qlt-version : ' latest'
125- add-to-path : true
126-
127- - name : Tag - Install CodeQL
119+ - name : Tag - Install CodeQL via GitHub CLI
128120 if : steps.needs-creation.outputs.needed == 'true'
121+ env :
122+ GH_TOKEN : ${{ github.token }}
129123 shell : bash
130124 run : |
131- echo "Installing CodeQL"
132- qlt codeql run install
133- echo "-----------------------------"
134- echo "CodeQL Home: $QLT_CODEQL_HOME"
135- echo "CodeQL Binary: $QLT_CODEQL_PATH"
125+ CODEQL_VERSION=$(jq -r .CodeQLCLI qlt.conf.json)
126+ echo "Installing CodeQL CLI ${CODEQL_VERSION} via gh-codeql..."
127+ gh extension install github/gh-codeql
128+ gh codeql set-version "${CODEQL_VERSION}"
129+ STUB_DIR="$HOME/.local/bin"
130+ mkdir -p "${STUB_DIR}"
131+ gh codeql install-stub "${STUB_DIR}/"
132+ echo "${STUB_DIR}" >> "$GITHUB_PATH"
133+ export PATH="${STUB_DIR}:${PATH}"
134+ echo "CodeQL version: $(codeql version --format=terse)"
136135
137136 - name : Tag - Upgrade CodeQL pack lock files
138137 if : steps.needs-creation.outputs.needed == 'true'
@@ -143,7 +142,7 @@ jobs:
143142 pack_dir=$(dirname "$qlpack_file")
144143 echo "Upgrading pack in directory: $pack_dir"
145144 cd "$pack_dir"
146- $QLT_CODEQL_PATH pack upgrade
145+ codeql pack upgrade
147146 cd - > /dev/null
148147 done
149148 echo "Finished upgrading all CodeQL pack lock files"
@@ -152,7 +151,6 @@ jobs:
152151 if : steps.needs-creation.outputs.needed == 'true'
153152 shell : bash
154153 run : |
155- export PATH="$(dirname "$QLT_CODEQL_PATH"):$PATH"
156154 chmod +x ./scripts/install-packs.sh
157155 ./scripts/install-packs.sh
158156
@@ -178,7 +176,7 @@ jobs:
178176 shell : bash
179177 run : |
180178 echo "Running CodeQL unit tests to validate release..."
181- $QLT_CODEQL_PATH test run \
179+ codeql test run \
182180 --threads=0 \
183181 --strict-test-discovery \
184182 --additional-packs="${GITHUB_WORKSPACE}" \
0 commit comments