Skip to content

Commit

Permalink
VPN-6220: Fix MacOS Taskcluster jobs after bad squash/merge (#9168)
Browse files Browse the repository at this point in the history
  • Loading branch information
oskirby authored Feb 21, 2024
1 parent 81f1648 commit 238ec12
Showing 1 changed file with 2 additions and 11 deletions.
13 changes: 2 additions & 11 deletions taskcluster/scripts/build/macos_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,8 @@ export LANG=en_US.utf-8
export PYTHONIOENCODING="UTF-8"

print Y "Installing conda"
chmod +x ${MOZ_FETCHES_DIR}/miniconda.sh
bash ${MOZ_FETCHES_DIR}/miniconda.sh -b -u -p ${TASK_HOME}/miniconda
source ${TASK_HOME}/miniconda/bin/activate


print Y "Installing provided conda env..."
# TODO: Check why --force is needed if we install into TASK_HOME?
conda env create --force -f env.yml
conda activate VPN
./scripts/macos/conda_install_extras.sh
conda info
source ${TASK_WORKDIR}/fetches/bin/activate
conda-unpack

# Conda Cannot know installed MacOS SDK'S
# and as we use conda'provided clang/llvm
Expand Down

0 comments on commit 238ec12

Please sign in to comment.