Skip to content

Merge main into releases/v3 #2739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10 commits into from
Closed

Merge main into releases/v3 #2739

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7d7758b
Skip proxy if no credentials
marcogario Jan 24, 2025
8aa028b
Merge branch 'main' into marcogario/skip_proxy
marcogario Jan 27, 2025
e2f043d
Remove unusued proxy_password input
marcogario Jan 27, 2025
c386dcd
Update changelog and version after v3.28.6
github-actions[bot] Jan 27, 2025
a5f217b
Update checked-in dependencies
github-actions[bot] Jan 27, 2025
43cffee
Merge pull request #2736 from github/mergeback/v3.28.6-to-main-17a820bf
aeisenberg Jan 27, 2025
5f4f998
Merge pull request #2733 from github/marcogario/remove_proxy_password
marcogario Jan 28, 2025
76622e7
Merge branch 'main' into marcogario/skip_proxy
marcogario Jan 28, 2025
54b1c84
Merge pull request #2724 from github/marcogario/skip_proxy
marcogario Jan 28, 2025
2e74238
Update changelog for v3.28.7
github-actions[bot] Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

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

## [UNRELEASED]

No user facing changes.

Comment on lines +7 to +8
Copy link
Preview

Copilot AI Jan 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing the proxy_password input is a user-facing change, so this line is misleading. Please update the changelog to reflect the removal of the proxy_password input or revert its removal if it was unintentional.

Suggested change
No user facing changes.
- Removed the `proxy_password` input. [#XXXX](https://github.com/github/codeql-action/pull/XXXX)

Copilot uses AI. Check for mistakes.

## 3.28.6 - 27 Jan 2025

- Re-enable debug artifact upload for CLI versions 2.20.3 or greater. [#2726](https://github.com/github/codeql-action/pull/2726)
Expand Down
14 changes: 0 additions & 14 deletions lib/start-proxy-action.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/start-proxy-action.js.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion node_modules/.package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "codeql",
"version": "3.28.6",
"version": "3.28.7",
"private": true,
"description": "CodeQL action",
"scripts": {
Expand Down
15 changes: 0 additions & 15 deletions src/start-proxy-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const UPDATEJOB_PROXY = "update-job-proxy";
const UPDATEJOB_PROXY_VERSION = "v2.0.20241023203727";
const UPDATEJOB_PROXY_URL_PREFIX =
"https://github.com/github/codeql-action/releases/download/codeql-bundle-v2.18.1/";
const PROXY_USER = "proxy_user";
const KEY_SIZE = 2048;
const KEY_EXPIRY_YEARS = 2;

Expand Down Expand Up @@ -113,12 +112,10 @@ async function runWrapper() {
);

const ca = generateCertificateAuthority();
const proxyAuth = getProxyAuth();

const proxyConfig: ProxyConfig = {
all_credentials: credentials,
ca,
proxy_auth: proxyAuth,
};

// Start the Proxy
Expand Down Expand Up @@ -187,18 +184,6 @@ async function startProxy(
}
}

// getProxyAuth returns the authentication information for the proxy itself.
function getProxyAuth(): BasicAuthCredentials | undefined {
const proxy_password = actionsUtil.getOptionalInput("proxy_password");
if (proxy_password) {
return {
username: PROXY_USER,
password: proxy_password,
};
}
return;
}

async function getProxyBinaryPath(): Promise<string> {
const proxyFileName =
process.platform === "win32" ? `${UPDATEJOB_PROXY}.exe` : UPDATEJOB_PROXY;
Expand Down
3 changes: 0 additions & 3 deletions start-proxy/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ inputs:
registries_credentials:
description: Base64 encoded JSON configuration for the URLs and credentials of the package registries
required: false
proxy_password:
required: false
description: The password of the proxy
token:
description: GitHub token to use for authenticating with this instance of GitHub, used to upload debug artifacts.
default: ${{ github.token }}
Expand Down
Loading
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