mirror of
https://github.com/github/codeql-action.git
synced 2026-05-21 13:04:08 +00:00
Merge remote-tracking branch 'origin/releases/v4' into backport-v3.35.5-9e0d7b8d2
# Conflicts: # analyze/action.yml # autobuild/action.yml # init/action.yml # resolve-environment/action.yml # setup-codeql/action.yml # start-proxy/action.yml # upload-sarif/action.yml
This commit is contained in:
@@ -29,6 +29,12 @@ outputs:
|
||||
proxy_urls:
|
||||
description: A stringified JSON array of objects containing the types and URLs of the configured registries.
|
||||
runs:
|
||||
<<<<<<< HEAD
|
||||
using: node20
|
||||
main: "../lib/start-proxy-action.js"
|
||||
post: "../lib/start-proxy-action-post.js"
|
||||
=======
|
||||
using: node24
|
||||
main: "../lib/start-proxy-entry.js"
|
||||
post: "../lib/start-proxy-post-entry.js"
|
||||
>>>>>>> origin/releases/v4
|
||||
|
||||
Reference in New Issue
Block a user