mirror of
https://github.com/actions/runner-images.git
synced 2025-12-18 15:57:17 +00:00
Merge branch 'v-mitim/add_ubuntu_20_to_ci' of https://github.com/miketimofeev/virtual-environments into v-mitim/add_ubuntu_20_to_ci
This commit is contained in:
@@ -61,10 +61,6 @@ echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager \
|
|||||||
"extras;android;m2repository" \
|
"extras;android;m2repository" \
|
||||||
"extras;google;m2repository" \
|
"extras;google;m2repository" \
|
||||||
"extras;google;google_play_services" \
|
"extras;google;google_play_services" \
|
||||||
"add-ons;addon-google_apis-google-24" \
|
|
||||||
"add-ons;addon-google_apis-google-23" \
|
|
||||||
"add-ons;addon-google_apis-google-22" \
|
|
||||||
"add-ons;addon-google_apis-google-21" \
|
|
||||||
"cmake;3.10.2.4988404" \
|
"cmake;3.10.2.4988404" \
|
||||||
"patcher;v4"
|
"patcher;v4"
|
||||||
|
|
||||||
@@ -72,10 +68,6 @@ echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager \
|
|||||||
echo "Lastly, document what was added to the metadata file"
|
echo "Lastly, document what was added to the metadata file"
|
||||||
DocumentInstalledItem "Google Repository $(cat ${ANDROID_SDK_ROOT}/extras/google/m2repository/source.properties 2>&1 | grep Pkg.Revision | cut -d '=' -f 2)"
|
DocumentInstalledItem "Google Repository $(cat ${ANDROID_SDK_ROOT}/extras/google/m2repository/source.properties 2>&1 | grep Pkg.Revision | cut -d '=' -f 2)"
|
||||||
DocumentInstalledItem "Google Play services $(cat ${ANDROID_SDK_ROOT}/extras/google/google_play_services/source.properties 2>&1 | grep Pkg.Revision | cut -d '=' -f 2)"
|
DocumentInstalledItem "Google Play services $(cat ${ANDROID_SDK_ROOT}/extras/google/google_play_services/source.properties 2>&1 | grep Pkg.Revision | cut -d '=' -f 2)"
|
||||||
DocumentInstalledItem "Google APIs 24"
|
|
||||||
DocumentInstalledItem "Google APIs 23"
|
|
||||||
DocumentInstalledItem "Google APIs 22"
|
|
||||||
DocumentInstalledItem "Google APIs 21"
|
|
||||||
DocumentInstalledItem "CMake $(ls ${ANDROID_SDK_ROOT}/cmake 2>&1)"
|
DocumentInstalledItem "CMake $(ls ${ANDROID_SDK_ROOT}/cmake 2>&1)"
|
||||||
DocumentInstalledItem "Android Support Repository 47.0.0"
|
DocumentInstalledItem "Android Support Repository 47.0.0"
|
||||||
DocumentInstalledItem "Android SDK Platform-Tools $(cat ${ANDROID_SDK_ROOT}/platform-tools/source.properties 2>&1 | grep Pkg.Revision | cut -d '=' -f 2)"
|
DocumentInstalledItem "Android SDK Platform-Tools $(cat ${ANDROID_SDK_ROOT}/platform-tools/source.properties 2>&1 | grep Pkg.Revision | cut -d '=' -f 2)"
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
|
|
||||||
# Source the helpers for use with the script
|
# Source the helpers for use with the script
|
||||||
source $HELPER_SCRIPTS/document.sh
|
source $HELPER_SCRIPTS/document.sh
|
||||||
|
source $HELPER_SCRIPTS/os.sh
|
||||||
|
|
||||||
# Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli)
|
# Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli)
|
||||||
if isUbuntu20 ; then
|
if isUbuntu20 ; then
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
|
|
||||||
# Source the helpers for use with the script
|
# Source the helpers for use with the script
|
||||||
source $HELPER_SCRIPTS/document.sh
|
source $HELPER_SCRIPTS/document.sh
|
||||||
|
source $HELPER_SCRIPTS/os.sh
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
|
|
||||||
# Source the helpers for use with the script
|
# Source the helpers for use with the script
|
||||||
source $HELPER_SCRIPTS/document.sh
|
source $HELPER_SCRIPTS/document.sh
|
||||||
|
source $HELPER_SCRIPTS/os.sh
|
||||||
|
|
||||||
# Install Python, Python 3, pip, pip3
|
# Install Python, Python 3, pip, pip3
|
||||||
if isUbuntu20 ; then
|
if isUbuntu20 ; then
|
||||||
|
|||||||
Reference in New Issue
Block a user