actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-18 15:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into v-dmshib/android-tools-dynamic-linux

Browse Source
This commit is contained in:
Dmitry Shibanov
2020-10-05 16:24:06 +03:00
parent 3187ff66cf 1ae6d84002
commit e3c86e5f66
26 changed files with 226 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ function Get-BazeliskVersion {
}
function Get-CodeQLBundleVersion {
$CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "codeql" | Join-Path -ChildPath "*"
$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

13
images/linux/scripts/installers/python.sh
View File

@@ -4,19 +4,18 @@
## Desc: Installs Python 2/3
################################################################################
set -e
# Source the helpers for use with the script
source $HELPER_SCRIPTS/os.sh
# Install Python, Python 3, pip, pip3
if isUbuntu20 ; then
apt-get install -y --no-install-recommends python3 python3-dev python3-pip
curl https://bootstrap.pypa.io/get-pip.py --output get-pip.py
python2 get-pip.py
if isUbuntu16 || isUbuntu18; then
apt-get install -y --no-install-recommends python python-dev python-pip python3 python3-dev python3-pip
fi
if isUbuntu16 || isUbuntu18 ; then
apt-get install -y --no-install-recommends python python-dev python-pip python3 python3-dev python3-pip
if isUbuntu20; then
apt-get install -y --no-install-recommends python3 python3-dev python3-pip
ln -s /usr/bin/pip3 /usr/bin/pip
fi
# Run tests to determine that the software installed as expected