Skip to content

Commit c394964

Browse files
authored
Merge pull request #376 from jcapriot/mac-latest-build-fix
Fix macos-latest build
2 parents b8bdafb + e93bc3b commit c394964

2 files changed

Lines changed: 20 additions & 4 deletions

File tree

.ci/azure/setup_miniconda_macos.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/bash
2+
set -ex #echo on and exit if any line fails
3+
4+
echo "arch is $ARCH"
5+
if [[ $ARCH == "X64" ]]; then
6+
MINICONDA_ARCH_LABEL="x86_64"
7+
else
8+
MINICONDA_ARCH_LABEL="arm64"
9+
fi
10+
echo $MINICONDA_ARCH_LABEL
11+
mkdir -p ~/miniconda3
12+
curl https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-$MINICONDA_ARCH_LABEL.sh -o ~/miniconda3/miniconda.sh
13+
bash ~/miniconda3/miniconda.sh -b -u -p ~/miniconda3
14+
rm ~/miniconda3/miniconda.sh
15+
echo "##vso[task.setvariable variable=CONDA;]${HOME}/miniconda3"

.ci/azure/test.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,16 @@ jobs:
3535
vmImage: $(image)
3636
variables:
3737
varOS: $(Agent.OS)
38+
ARCH: $(Agent.OSArchitecture)
3839
steps:
40+
- bash: .ci/azure/setup_miniconda_macos.sh
41+
displayName: Install miniconda on mac
42+
condition: eq(variables.varOS, 'Darwin')
43+
3944
- bash: echo "##vso[task.prependpath]$CONDA/bin"
4045
displayName: Add conda to PATH
4146
condition: ne(variables.varOS, 'Windows_NT')
4247

43-
- bash: sudo chown -R $USER $CONDA
44-
displayName: Take ownership of conda directory
45-
condition: eq(variables.varOS, 'Darwin')
46-
4748
- powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
4849
displayName: Add conda to PATH
4950
condition: eq(variables.varOS, 'Windows_NT')

0 commit comments

Comments
 (0)