actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-13 20:56:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use new approach for documenting CodeQL on Ubuntu.

Browse Source
This commit is contained in:
Chris Gavin
2020-09-20 09:29:43 +01:00
parent 3243c81039
commit 49dc2ce2fd
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
View File

@@ -77,6 +77,7 @@ $toolsList = @(
(Get-AzCopy10Version), (Get-AzCopy10Version),
(Get-BazelVersion), (Get-BazelVersion),
(Get-BazeliskVersion), (Get-BazeliskVersion),
(Get-CodeQLBundleVersion),
(Get-CMakeVersion), (Get-CMakeVersion),
(Get-CurlVersion), (Get-CurlVersion),
(Get-DockerMobyVersion), (Get-DockerMobyVersion),

8
images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
View File

@@ -28,6 +28,14 @@ function Get-BazeliskVersion {
return "Bazelisk $bazeliskVersion" return "Bazelisk $bazeliskVersion"
} }
function Get-CodeQLBundleVersion {
$CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "codeql" | Join-Path -ChildPath "*"
$CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Select-Object -First 1 -Expand FullName
$CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql"
$CodeQLVersion = $($CodeQLPath version --quiet)
return "CodeQL Action Bundle $CodeQLVersion"
}
function Get-PodManVersion { function Get-PodManVersion {
$podmanVersion = podman --version | Take-OutputPart -Part 2 $podmanVersion = podman --version | Take-OutputPart -Part 2
return "Podman $podmanVersion" return "Podman $podmanVersion"

5
images/linux/scripts/installers/codeql-bundle.sh
View File

@@ -5,7 +5,6 @@
################################################################################ ################################################################################
source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/install.sh
source $HELPER_SCRIPTS/document.sh
# Retrieve the name of the CodeQL bundle preferred by the Action (in the format codeql-bundle-YYYYMMDD). # Retrieve the name of the CodeQL bundle preferred by the Action (in the format codeql-bundle-YYYYMMDD).
codeql_bundle_name="$(curl -sSL https://raw.githubusercontent.com/github/codeql-action/main/src/defaults.json | jq -r .bundleVersion)" codeql_bundle_name="$(curl -sSL https://raw.githubusercontent.com/github/codeql-action/main/src/defaults.json | jq -r .bundleVersion)"
@@ -24,7 +23,3 @@ touch "$extraction_directory/pinned-version"
# Test that the tool has been extracted successfully. # Test that the tool has been extracted successfully.
"$AGENT_TOOLSDIRECTORY/CodeQL/$codeql_bundle_version/x64/codeql/codeql" version "$AGENT_TOOLSDIRECTORY/CodeQL/$codeql_bundle_version/x64/codeql/codeql" version
# Document the version installed.
version="$("$AGENT_TOOLSDIRECTORY/CodeQL/$codeql_bundle_version/x64/codeql/codeql" version --quiet)"
DocumentInstalledItem "CodeQL Action Bundle ($version)"

2
images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
View File

@@ -254,4 +254,4 @@ function Get-VisualCPPComponents {
} }
} }
} }
} }