Merge branch 'main' into v-sedoli/fix-apt

This commit is contained in:
Maxim Lobanov
2020-11-02 20:10:38 +03:00
committed by GitHub
15 changed files with 824 additions and 57 deletions

View File

@@ -35,7 +35,7 @@ JAVA_DEFAULT=$(get_toolset_value '.java.default')
for JAVA_VERSION in "${JAVA_VERSIONS_LIST[@]}"
do
if [[ $JAVA_VERSION == "7" ]]; then
installAzulJDK "https://cdn.azul.com/zulu/bin/zulu7.40.0.15-ca-jdk7.0.272-macosx_x64.dmg"
installAzulJDK "https://cdn.azul.com/zulu/bin/zulu7.42.0.13-ca-jdk7.0.282-macosx_x64.dmg"
else
brew cask install "adoptopenjdk${JAVA_VERSION}"
fi

View File

@@ -1,5 +1,4 @@
#!/bin/bash -e -o pipefail
source ~/utils/utils.sh
export PATH="$PATH:/opt/pipx_bin"

View File

@@ -10,7 +10,7 @@ brew install python@3.8
brew install python@3.9
brew unlink python@3.9
brew unlink python@3.8
brew link python@3.8
brew link python@3.8 --force
echo "Brew Installing Python 2"
# Create local tap with formula due to python2 formula depreciation