Checkout fixed formulas commit in tf_tc-brew.sh

This commit is contained in:
Reuben Morais 2020-07-14 16:05:00 +02:00
parent a274c26a89
commit f7c50663e1
2 changed files with 46 additions and 37 deletions

View File

@ -35,11 +35,8 @@ payload:
# There is no VM yet running tasks on OSX # There is no VM yet running tasks on OSX
# so one should install by hand: # so one should install by hand:
# - brew # - brew
# - xcode (brew would install) # - Xcode 10.1 in /Applications/Xcode.app, then sudo chown -R root:wheel /Applications/Xcode.app
# - brew install gnu-tar # - brew install gnu-tar git pixz wget coreutils pyenv-virtualenv
# - brew install git
# - brew install pixz
# - brew cask install java
# - sudo easy_install pip # - sudo easy_install pip
command: command:

View File

@ -2,43 +2,55 @@
set -ex set -ex
if [ -z "${TASKCLUSTER_TASK_DIR}" ]; then # if [ -z "${TASKCLUSTER_TASK_DIR}" ]; then
echo "No TASKCLUSTER_TASK_DIR, aborting." # echo "No TASKCLUSTER_TASK_DIR, aborting."
exit 1 # exit 1
fi # fi
LOCAL_BREW="${TASKCLUSTER_TASK_DIR}/homebrew" # LOCAL_BREW="${TASKCLUSTER_TASK_DIR}/homebrew"
export PATH=${LOCAL_BREW}/bin:$PATH # export PATH=${LOCAL_BREW}/bin:$PATH
export HOMEBREW_LOGS="${TASKCLUSTER_TASK_DIR}/homebrew.logs/" # export HOMEBREW_LOGS="${TASKCLUSTER_TASK_DIR}/homebrew.logs/"
export HOMEBREW_CACHE="${TASKCLUSTER_TASK_DIR}/homebrew.cache/" # export HOMEBREW_CACHE="${TASKCLUSTER_TASK_DIR}/homebrew.cache/"
# export HOMEBREW_FORMULAS_COMMIT=93fe256e0168db3b1c70c26a01941be59ce76311
# export HOMEBREW_NO_AUTO_UPDATE=1
# Never fail on pre-existing homebrew/ directory # # Never fail on pre-existing homebrew/ directory
mkdir -p "${LOCAL_BREW}" || true # mkdir -p "${LOCAL_BREW}" || true
mkdir -p "${HOMEBREW_CACHE}" || true # mkdir -p "${HOMEBREW_CACHE}" || true
# Make sure to verify there is a 'brew' binary there, otherwise install things. # # Make sure to verify there is a 'brew' binary there, otherwise install things.
if [ ! -x "${LOCAL_BREW}/bin/brew" ]; then # if [ ! -x "${LOCAL_BREW}/bin/brew" ]; then
curl -L https://github.com/Homebrew/brew/tarball/2.2.17 | tar xz --strip 1 -C "${LOCAL_BREW}" # curl -L https://github.com/Homebrew/brew/tarball/2.2.17 | tar xz --strip 1 -C "${LOCAL_BREW}"
fi; # fi;
echo "local brew list (should be empty) ..." # echo "local brew list (should be empty) ..."
brew list # brew list
echo "local brew prefix ..." # echo "local brew prefix ..."
local_prefix=$(brew --prefix) # local_prefix=$(brew --prefix)
echo "${local_prefix}" # echo "${local_prefix}"
if [ "${LOCAL_BREW}" != "${local_prefix}" ]; then # if [ "${LOCAL_BREW}" != "${local_prefix}" ]; then
echo "Weird state:" # echo "Weird state:"
echo "LOCAL_BREW=${LOCAL_BREW}" # echo "LOCAL_BREW=${LOCAL_BREW}"
echo "local_prefix=${local_prefix}" # echo "local_prefix=${local_prefix}"
exit 1 # exit 1
fi; # fi;
# coreutils, pyenv-virtualenv required for build of tensorflow
all_pkgs="coreutils pyenv-virtualenv"
for pkg in ${all_pkgs}; # # Then we force onto a specific well-known commit
do # mkdir -p "$(brew --prefix)/Library/Taps/homebrew/homebrew-core"
(brew list --versions ${pkg} && brew upgrade ${pkg}) || brew install ${pkg} # pushd "$(brew --prefix)/Library/Taps/homebrew/homebrew-core"
done; # git init
# git remote add origin https://github.com/Homebrew/homebrew-core.git
# git fetch origin
# git checkout ${HOMEBREW_FORMULAS_COMMIT}
# popd
# # coreutils, pyenv-virtualenv required for build of tensorflow
# all_pkgs="coreutils pyenv-virtualenv"
# for pkg in ${all_pkgs};
# do
# (brew list --versions ${pkg} && brew upgrade ${pkg}) || brew install ${pkg}
# done;