Skip to content

Commit 3df8176

Browse files
committed
Remove qlt from release workflows
1 parent 673a3d0 commit 3df8176

File tree

2 files changed

+30
-33
lines changed

2 files changed

+30
-33
lines changed

.github/workflows/release-codeql.yml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -73,26 +73,25 @@ jobs:
7373
with:
7474
ref: refs/tags/${{ steps.version.outputs.version }}
7575

76-
- name: CodeQL - Install QLT
77-
id: install-qlt
78-
uses: advanced-security/codeql-development-toolkit/.github/actions/install-qlt@main
79-
with:
80-
qlt-version: 'latest'
81-
add-to-path: true
82-
83-
- name: CodeQL - Install CodeQL
76+
- name: CodeQL - Install CodeQL via GitHub CLI
77+
env:
78+
GH_TOKEN: ${{ github.token }}
8479
shell: bash
8580
run: |
86-
echo "Installing CodeQL"
87-
qlt codeql run install
88-
echo "-----------------------------"
89-
echo "CodeQL Home: $QLT_CODEQL_HOME"
90-
echo "CodeQL Binary: $QLT_CODEQL_PATH"
81+
CODEQL_VERSION=$(jq -r .CodeQLCLI qlt.conf.json)
82+
echo "Installing CodeQL CLI ${CODEQL_VERSION} via gh-codeql..."
83+
gh extension install github/gh-codeql
84+
gh codeql set-version "${CODEQL_VERSION}"
85+
STUB_DIR="$HOME/.local/bin"
86+
mkdir -p "${STUB_DIR}"
87+
gh codeql install-stub "${STUB_DIR}/"
88+
echo "${STUB_DIR}" >> "$GITHUB_PATH"
89+
export PATH="${STUB_DIR}:${PATH}"
90+
echo "CodeQL version: $(codeql version --format=terse)"
9191
9292
- name: CodeQL - Install pack dependencies
9393
shell: bash
9494
run: |
95-
export PATH="$(dirname "$QLT_CODEQL_PATH"):$PATH"
9695
chmod +x ./scripts/install-packs.sh
9796
./scripts/install-packs.sh
9897
@@ -116,7 +115,7 @@ jobs:
116115
if [ -d "${pack_dir}" ]; then
117116
pack_name=$(grep -m1 "^name:" "${pack_dir}/qlpack.yml" | awk '{print $2}')
118117
echo "📦 Publishing ${pack_name} from ${pack_dir}..."
119-
$QLT_CODEQL_PATH pack publish --threads=-1 -- "${pack_dir}"
118+
echo "${GITHUB_TOKEN}" | codeql pack publish --github-auth-stdin --threads=-1 -- "${pack_dir}"
120119
echo "✅ Published ${pack_name}"
121120
else
122121
echo "⚠️ Skipping: ${pack_dir} not found"
@@ -144,7 +143,7 @@ jobs:
144143
bundle_name="${pack_name#advanced-security/}"
145144
output="dist-packs/${bundle_name}.tar.gz"
146145
echo "📦 Bundling ${pack_name} -> ${output}..."
147-
$QLT_CODEQL_PATH pack bundle --threads=-1 --output="${output}" -- "${pack_dir}"
146+
codeql pack bundle --threads=-1 --output="${output}" -- "${pack_dir}"
148147
echo "✅ Bundled ${bundle_name}"
149148
fi
150149
done

.github/workflows/release-tag.yml

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -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

Comments
 (0)