From 0636feb5aae58d42ab6a50b230f3d25c6dcb4a5d Mon Sep 17 00:00:00 2001 From: Delphine Roux Date: Thu, 27 Apr 2023 00:21:48 -0700 Subject: [PATCH] updates for MacOS M1/arm64 runners (#7453) --- .../bootstrap-provisioner/installNewProvisioner.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/images/macos/provision/bootstrap-provisioner/installNewProvisioner.sh b/images/macos/provision/bootstrap-provisioner/installNewProvisioner.sh index e588c670..81cdbdff 100644 --- a/images/macos/provision/bootstrap-provisioner/installNewProvisioner.sh +++ b/images/macos/provision/bootstrap-provisioner/installNewProvisioner.sh @@ -5,12 +5,17 @@ ProvisionerScriptUri="$3" ScriptName="$4" ScriptParam="$5" Username="$6" +arch=$(arch) -export PATH=/usr/bin:/usr/sbin:/usr/local/bin:/bin:/sbin +if [[ $arch == "arm64" ]]; then + export PATH=/usr/bin:/usr/sbin:/usr/local/bin:/bin:/sbin:/opt/homebrew/bin +else + export PATH=/usr/bin:/usr/sbin:/usr/local/bin:/bin:/sbin +fi PROVISIONER_ROOT=/usr/local/opt/${Username} -mkdir -p ${PROVISIONER_ROOT} -chown ${Username} ${PROVISIONER_ROOT} +sudo mkdir -p ${PROVISIONER_ROOT} +sudo chown ${Username} ${PROVISIONER_ROOT} tee -a ${PROVISIONER_ROOT}/runprovisioner.sh > /dev/null <<\EOF #!/bin/bash