Skip to content
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.

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

Merge releases/v3 into releases/v2 #2683

Merged
merged 41 commits into from
Jan 10, 2025
Merged
Changes from 4 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
2012e4b
Update changelog and version after v3.28.0
github-actions[bot] Dec 20, 2024
985eb4f
Update checked-in dependencies
github-actions[bot] Dec 20, 2024
7876007
Merge pull request #2663 from github/mergeback/v3.28.0-to-main-48ab28a6
aeisenberg Dec 20, 2024
3239a39
build(deps-dev): bump the npm group with 2 updates
dependabot[bot] Dec 23, 2024
dd5146d
Update checked-in dependencies
github-actions[bot] Dec 23, 2024
d43af81
build(deps): bump actions/create-github-app-token in the actions group
dependabot[bot] Dec 23, 2024
adc78ec
Merge pull request #2666 from github/dependabot/github_actions/action…
angelapwen Dec 23, 2024
5b6e617
Merge pull request #2665 from github/dependabot/npm_and_yarn/npm-d4fe…
angelapwen Dec 23, 2024
1e70014
Adds new doc URL for build modes
sidshank Dec 23, 2024
0a7d6c2
Improves autobuilder log message
sidshank Dec 23, 2024
ea41240
Fix code scanning alert no. 1114: Ensure code is properly formatted, …
aeisenberg Jan 5, 2025
5bf0e05
Rebuild
github-actions[bot] Jan 5, 2025
97aec69
Include registry type in `proxy_urls` output
mbg Jan 6, 2025
3407610
Merge pull request #2668 from github/sidshank/improve-autobuilder-log…
sidshank Jan 6, 2025
cf733fe
build(deps): bump the npm group with 3 updates
dependabot[bot] Jan 6, 2025
07a86f8
Update checked-in dependencies
github-actions[bot] Jan 6, 2025
a06dbc6
Change `OLDEST_SUPPORTED_MAJOR_VERSION` to 3
angelapwen Jan 7, 2025
04b5afa
Convert deprecation warning to error
angelapwen Jan 7, 2025
913d605
Remove mentions to v2 in documentation
angelapwen Jan 7, 2025
4541c13
[WIP] Add changenote for deprecation
angelapwen Jan 7, 2025
66f5682
Add section on adding a new major version
angelapwen Jan 7, 2025
03d5731
Keep `OLDEST_SUPPORTED_MAJOR_VERSION` to 2 for now
angelapwen Jan 7, 2025
4daa595
Update default bundle to codeql-bundle-v2.20.1
github-actions[bot] Jan 8, 2025
9dab6bb
Add changelog note
github-actions[bot] Jan 8, 2025
b25558b
Update `proxy_urls` description
mbg Jan 8, 2025
fb65b6c
Merge pull request #2672 from github/mbg/start-proxy/include-type-in-…
mbg Jan 8, 2025
1aa16c2
Merge branch 'main' into update-bundle/codeql-bundle-v2.20.1
dbartol Jan 9, 2025
b7ff308
Merge pull request #2678 from github/update-bundle/codeql-bundle-v2.20.1
dbartol Jan 9, 2025
e83e0a4
Merge pull request #2673 from github/dependabot/npm_and_yarn/npm-877f…
angelapwen Jan 9, 2025
8d2753b
Add public changelog blog post link
angelapwen Jan 10, 2025
a05a7eb
Fix PR number in changenote
angelapwen Jan 10, 2025
4df151e
Merge branch 'main' into angelapwen/deprecate-action-v2
angelapwen Jan 10, 2025
ea6acbf
Merge pull request #2677 from github/angelapwen/deprecate-action-v2
angelapwen Jan 10, 2025
bb999b4
Update changelog for v3.28.1
github-actions[bot] Jan 10, 2025
b6a472f
Merge pull request #2681 from github/update-v3.28.1-ea6acbfea
angelapwen Jan 10, 2025
ae8ac6d
Revert "Update version and changelog for v2.28.0"
github-actions[bot] Jan 10, 2025
dba37a4
Revert "Update checked-in dependencies"
github-actions[bot] Jan 10, 2025
223d984
Merge remote-tracking branch 'origin/releases/v3' into backport-v2.28…
github-actions[bot] Jan 10, 2025
e798839
Update version and changelog for v2.28.1
github-actions[bot] Jan 10, 2025
c3eb0b5
Manually fix changelog merge conficts
angelapwen Jan 10, 2025
b8404b8
Update checked-in dependencies
github-actions[bot] Jan 10, 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
5 changes: 4 additions & 1 deletion lib/start-proxy-action.js

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

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

5 changes: 4 additions & 1 deletion src/start-proxy-action.ts
Original file line number Diff line number Diff line change
@@ -174,7 +174,10 @@ async function startProxy(

const registry_urls = config.all_credentials
.filter((credential) => credential.url !== undefined)
.map((credential) => credential.url);
.map((credential) => ({
type: credential.type,
url: credential.url,
}));
core.setOutput("proxy_urls", JSON.stringify(registry_urls));
} catch (error) {
core.setFailed(`start-proxy action failed: ${util.getErrorMessage(error)}`);
2 changes: 1 addition & 1 deletion start-proxy/action.yml
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ outputs:
proxy_ca_certificate:
description: The proxy's internal CA certificate in PEM format
proxy_urls:
description: The URLs of the configured registries, as a JSON array.
description: A stringified JSON array of objects containing the types and URLs of the configured registries.
runs:
using: node20
main: "../lib/start-proxy-action.js"