mirror of
https://github.com/actions/runner-images.git
synced 2026-01-04 01:03:18 +08:00
Fixed typos (#9509)
* Fixed some typos. * Some more typos. --------- Co-authored-by: Leon Zandman <lzandman@rdw.nl>
This commit is contained in:
Leon Zandman
@@ -12,7 +12,7 @@ source $HELPER_SCRIPTS/etc-environment.sh
|
||||
# might mail error messages to root, but that's it; otherwise it
|
||||
# is completely silent and unobtrusive, a perfect frontend for
|
||||
# automatic installs. If you are using this front-end, and require
|
||||
# non-default answers to questions, you will need to preseed the
|
||||
# non-default answers to questions, you will need to pre-seed the
|
||||
# debconf database
|
||||
set_etc_environment_variable "DEBIAN_FRONTEND" "noninteractive"
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ set_etc_environment_variable "ACCEPT_EULA" "Y"
|
||||
mkdir -p /etc/skel/.config/configstore
|
||||
set_etc_environment_variable "XDG_CONFIG_HOME" '$HOME/.config'
|
||||
|
||||
# Change waagent entries to use /mnt for swapfile
|
||||
# Change waagent entries to use /mnt for swap file
|
||||
sed -i 's/ResourceDisk.Format=n/ResourceDisk.Format=y/g' /etc/waagent.conf
|
||||
sed -i 's/ResourceDisk.EnableSwap=n/ResourceDisk.EnableSwap=y/g' /etc/waagent.conf
|
||||
sed -i 's/ResourceDisk.SwapSizeMB=0/ResourceDisk.SwapSizeMB=4096/g' /etc/waagent.conf
|
||||
|
||||
@@ -23,7 +23,7 @@ ENVPATH=${ENVPATH%"\""}
|
||||
replace_etc_environment_variable "PATH" "${ENVPATH}"
|
||||
echo "Updated /etc/environment: $(cat /etc/environment)"
|
||||
|
||||
# Сlean yarn and npm cache
|
||||
# Clean yarn and npm cache
|
||||
if yarn --version > /dev/null; then
|
||||
yarn cache clean
|
||||
fi
|
||||
|
||||
@@ -9,13 +9,13 @@ source $HELPER_SCRIPTS/os.sh
|
||||
source $HELPER_SCRIPTS/install.sh
|
||||
source $HELPER_SCRIPTS/etc-environment.sh
|
||||
|
||||
add_filtered_instalaltion_components() {
|
||||
add_filtered_installation_components() {
|
||||
local minimum_version=$1
|
||||
shift
|
||||
local tools_array=("$@")
|
||||
|
||||
for item in ${tools_array[@]}; do
|
||||
# Take the last argument after spliting string by ';'' and '-''
|
||||
# Take the last argument after splitting string by ';'' and '-''
|
||||
item_version=$(echo "${item##*[-;]}")
|
||||
|
||||
# Semver 'comparison'. Add item to components array, if item's version is greater than or equal to minimum version
|
||||
@@ -107,8 +107,8 @@ available_platforms=($($SDKMANAGER --list | sed -n '/Available Packages:/,/^$/p'
|
||||
all_build_tools=($($SDKMANAGER --list | grep "build-tools;" | cut -d"|" -f 1 | sort -u))
|
||||
available_build_tools=$(echo ${all_build_tools[@]//*rc[0-9]/})
|
||||
|
||||
add_filtered_instalaltion_components $minimum_platform_version "${available_platforms[@]}"
|
||||
add_filtered_instalaltion_components $minimum_build_tool_version "${available_build_tools[@]}"
|
||||
add_filtered_installation_components $minimum_platform_version "${available_platforms[@]}"
|
||||
add_filtered_installation_components $minimum_build_tool_version "${available_build_tools[@]}"
|
||||
|
||||
# Install components
|
||||
echo "y" | $SDKMANAGER ${components[@]}
|
||||
|
||||
@@ -45,7 +45,7 @@ EOF
|
||||
apt-get update
|
||||
|
||||
for latest_package in ${latest_dotnet_packages[@]}; do
|
||||
echo "Determing if .NET Core ($latest_package) is installed"
|
||||
echo "Determining if .NET Core ($latest_package) is installed"
|
||||
if ! dpkg -S $latest_package &> /dev/null; then
|
||||
echo "Could not find .NET Core ($latest_package), installing..."
|
||||
apt-get install $latest_package -y
|
||||
|
||||
@@ -9,7 +9,7 @@ source $HELPER_SCRIPTS/install.sh
|
||||
source $HELPER_SCRIPTS/etc-environment.sh
|
||||
|
||||
# Mozillateam PPA is added manually because sometimes
|
||||
# lanuchad portal sends empty answer when trying to add it automatically
|
||||
# launchpad portal sends empty answer when trying to add it automatically
|
||||
|
||||
REPO_URL="http://ppa.launchpad.net/mozillateam/ppa/ubuntu"
|
||||
GPG_FINGERPRINT="0ab215679c571d1c8325275b9bdb3d89ce49ec21"
|
||||
@@ -27,7 +27,7 @@ rm $REPO_PATH
|
||||
# Document apt source repo's
|
||||
echo "mozillateam $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt
|
||||
|
||||
# add to gloabl system preferences for firefox locale en_US, because other browsers have en_US local.
|
||||
# add to global system preferences for firefox locale en_US, because other browsers have en_US local.
|
||||
# Default firefox local is en_GB
|
||||
echo 'pref("intl.locale.requested","en_US");' >> "/usr/lib/firefox/browser/defaults/preferences/syspref.js"
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
# Source the helpers for use with the script
|
||||
source $HELPER_SCRIPTS/etc-environment.sh
|
||||
|
||||
# Any nonzero value for noninteractive installation
|
||||
# Any nonzero value for non-interactive installation
|
||||
export BOOTSTRAP_HASKELL_NONINTERACTIVE=1
|
||||
export BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1
|
||||
export GHCUP_INSTALL_BASE_PREFIX=/usr/local
|
||||
|
||||
@@ -12,7 +12,7 @@ source $HELPER_SCRIPTS/install.sh
|
||||
# Install the Homebrew on Linux
|
||||
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
|
||||
|
||||
# Invoke shellenv to make brew available during runnig session
|
||||
# Invoke shellenv to make brew available during running session
|
||||
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
|
||||
|
||||
set_etc_environment_variable HOMEBREW_NO_AUTO_UPDATE 1
|
||||
|
||||
@@ -61,7 +61,7 @@ install_open_jdk() {
|
||||
chmod -R 777 /usr/lib/jvm
|
||||
}
|
||||
|
||||
# Add Addoptium PPA
|
||||
# Add Adoptium PPA
|
||||
# apt-key is deprecated, dearmor and add manually
|
||||
wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor > /usr/share/keyrings/adoptium.gpg
|
||||
echo "deb [signed-by=/usr/share/keyrings/adoptium.gpg] https://packages.adoptium.net/artifactory/deb/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/adoptium.list
|
||||
|
||||
@@ -28,7 +28,7 @@ fi
|
||||
# Cleanup Cargo cache
|
||||
rm -rf ${CARGO_HOME}/registry/*
|
||||
|
||||
# Update /etc/environemnt
|
||||
# Update /etc/environment
|
||||
prepend_etc_environment_path '$HOME/.cargo/bin'
|
||||
|
||||
invoke_tests "Tools" "Rust"
|
||||
|
||||
@@ -14,7 +14,7 @@ selenium_major_version=$(get_toolset_value '.selenium.version')
|
||||
selenium_download_url=$(resolve_github_release_asset_url "SeleniumHQ/selenium" "contains(\"selenium-server-\") and endswith(\".jar\")" "$selenium_major_version\.+" "" "true")
|
||||
selenium_jar_path=$(download_with_retry "$selenium_download_url" "/usr/share/java/selenium-server.jar")
|
||||
|
||||
# Create an epmty file to retrive selenium version
|
||||
# Create an empty file to retrieve selenium version
|
||||
selenium_full_version=$(echo $selenium_download_url | awk -F"selenium-server-|.jar" '{print $2}')
|
||||
touch "/usr/share/java/selenium-server-$selenium_full_version"
|
||||
|
||||
|
||||
@@ -16,8 +16,8 @@ swift_release_name="swift-${swift_version}-RELEASE-${image_label}"
|
||||
archive_url="https://swift.org/builds/swift-${swift_version}-release/${image_label//./}/swift-${swift_version}-RELEASE/${swift_release_name}.tar.gz"
|
||||
archive_path=$(download_with_retry "$archive_url")
|
||||
|
||||
# Verifing pgp signature using official swift pgp key. Referring to https://www.swift.org/install/linux/#Installation-via-Tarball
|
||||
# Download and import swift pgp key
|
||||
# Verifying PGP signature using official Swift PGP key. Referring to https://www.swift.org/install/linux/#Installation-via-Tarball
|
||||
# Download and import Swift PGP key
|
||||
pgp_key_path=$(download_with_retry "https://swift.org/keys/all-keys.asc")
|
||||
gpg --no-default-keyring --keyring swift --import "$pgp_key_path"
|
||||
|
||||
@@ -25,7 +25,7 @@ gpg --no-default-keyring --keyring swift --import "$pgp_key_path"
|
||||
signature_path=$(download_with_retry "${archive_url}.sig")
|
||||
gpg --no-default-keyring --keyring swift --verify "$signature_path" "$archive_path"
|
||||
|
||||
# Remove swift pgp public key with temporary keyring
|
||||
# Remove Swift PGP public key with temporary keyring
|
||||
rm ~/.gnupg/swift
|
||||
|
||||
# Extract and install swift
|
||||
|
||||
Reference in New Issue
Block a user