chore: resolve merge conflicts in action.yml files

This commit is contained in:
Sam Robson
2026-11-04 17:02:02 +00:00
parent 205ef9f17d
commit 8f01efb334
5 changed files with 0 additions and 27 deletions

View File

@@ -15,10 +15,5 @@ inputs:
$GITHUB_WORKSPACE as its working directory.
required: false
runs:
<<<<<<< HEAD
using: node20
main: '../lib/autobuild-entry.js'
=======
using: node24
main: "../lib/autobuild-entry.js"
>>>>>>> origin/releases/v4

View File

@@ -180,12 +180,6 @@ outputs:
codeql-version:
description: The version of the CodeQL binary used for analysis
runs:
<<<<<<< HEAD
using: node20
main: '../lib/init-entry.js'
post: '../lib/init-post-entry.js'
=======
using: node24
main: "../lib/init-entry.js"
post: "../lib/init-post-entry.js"
>>>>>>> origin/releases/v4

View File

@@ -21,10 +21,5 @@ outputs:
environment:
description: The inferred build environment configuration.
runs:
<<<<<<< HEAD
using: node20
main: '../lib/resolve-environment-entry.js'
=======
using: node24
main: "../lib/resolve-environment-entry.js"
>>>>>>> origin/releases/v4

View File

@@ -51,10 +51,5 @@ outputs:
codeql-version:
description: The version of the CodeQL binary that was installed.
runs:
<<<<<<< HEAD
using: node20
main: '../lib/setup-codeql-entry.js'
=======
using: node24
main: "../lib/setup-codeql-entry.js"
>>>>>>> origin/releases/v4

View File

@@ -41,12 +41,6 @@ outputs:
{ "code-scanning": "some-id", "code-quality": "some-other-id" }
runs:
<<<<<<< HEAD
using: node20
main: '../lib/upload-sarif-entry.js'
post: '../lib/upload-sarif-post-entry.js'
=======
using: node24
main: "../lib/upload-sarif-entry.js"
post: "../lib/upload-sarif-post-entry.js"
>>>>>>> origin/releases/v4