Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VPN-6220: Fix MacOS Taskcluster jobs after bad squash/merge #9168

Merged
merged 1 commit into from
Feb 21, 2024
Merged

VPN-6220: Fix MacOS Taskcluster jobs after bad squash/merge #9168

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions taskcluster/scripts/build/macos_build.sh
View file
Open in desktop
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
Loading