Skip to content

Commit 6e54559

Browse files
marcogariomarcogario
authored
Merge pull request #2743 from github/update-v3.28.7-797fb30ed
Merge main into releases/v3
2 parents 17a820b + cd34602 commit 6e54559

11 files changed

+37
-38
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
See the [releases page](https://github.com/github/codeql-action/releases) for the relevant changes to the CodeQL CLI and language packs.
44

5+
## 3.28.7 - 29 Jan 2025
6+
7+
No user facing changes.
8+
59
## 3.28.6 - 27 Jan 2025
610

711
- Re-enable debug artifact upload for CLI versions 2.20.3 or greater. [#2726](https://github.com/github/codeql-action/pull/2726)

‎lib/analyze-action.js

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/analyze-action.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/start-proxy-action.js

Lines changed: 4 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/start-proxy-action.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎node_modules/.package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codeql",
3-
"version": "3.28.6",
3+
"version": "3.28.7",
44
"private": true,
55
"description": "CodeQL action",
66
"scripts": {

‎src/analyze-action.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,15 @@ async function run() {
202202
let didUploadTrapCaches = false;
203203
util.initializeEnvironment(actionsUtil.getActionVersion());
204204

205+
// Unset the CODEQL_PROXY_* environment variables, as they are not needed
206+
// and can cause issues with the CodeQL CLI
207+
// Check for CODEQL_PROXY_HOST: and if it is empty but set, unset it
208+
if (process.env.CODEQL_PROXY_HOST === "") {
209+
delete process.env.CODEQL_PROXY_HOST;
210+
delete process.env.CODEQL_PROXY_PORT;
211+
delete process.env.CODEQL_PROXY_CA_CERTIFICATE;
212+
}
213+
205214
// Make inputs accessible in the `post` step, details at
206215
// https://github.com/github/codeql-action/issues/2553
207216
actionsUtil.persistInputs();

‎src/start-proxy-action.ts

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const UPDATEJOB_PROXY = "update-job-proxy";
1414
const UPDATEJOB_PROXY_VERSION = "v2.0.20241023203727";
1515
const UPDATEJOB_PROXY_URL_PREFIX =
1616
"https://github.com/github/codeql-action/releases/download/codeql-bundle-v2.18.1/";
17-
const PROXY_USER = "proxy_user";
1817
const KEY_SIZE = 2048;
1918
const KEY_EXPIRY_YEARS = 2;
2019

@@ -100,19 +99,23 @@ async function runWrapper() {
10099
actionsUtil.getOptionalInput("registries_credentials"),
101100
actionsUtil.getOptionalInput("language"),
102101
);
102+
103+
if (credentials.length === 0) {
104+
logger.info("No credentials found, skipping proxy setup.");
105+
return;
106+
}
107+
103108
logger.info(
104109
`Credentials loaded for the following registries:\n ${credentials
105110
.map((c) => credentialToStr(c))
106111
.join("\n")}`,
107112
);
108113

109114
const ca = generateCertificateAuthority();
110-
const proxyAuth = getProxyAuth();
111115

112116
const proxyConfig: ProxyConfig = {
113117
all_credentials: credentials,
114118
ca,
115-
proxy_auth: proxyAuth,
116119
};
117120

118121
// Start the Proxy
@@ -181,18 +184,6 @@ async function startProxy(
181184
}
182185
}
183186

184-
// getProxyAuth returns the authentication information for the proxy itself.
185-
function getProxyAuth(): BasicAuthCredentials | undefined {
186-
const proxy_password = actionsUtil.getOptionalInput("proxy_password");
187-
if (proxy_password) {
188-
return {
189-
username: PROXY_USER,
190-
password: proxy_password,
191-
};
192-
}
193-
return;
194-
}
195-
196187
async function getProxyBinaryPath(): Promise<string> {
197188
const proxyFileName =
198189
process.platform === "win32" ? `${UPDATEJOB_PROXY}.exe` : UPDATEJOB_PROXY;

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy