update macos builds

nervosys · Mar 8, 2024 · bbddc4b · bbddc4b
1 parent 0327cb7
commit bbddc4b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/test_macos.yml b/.github/workflows/test_macos.yml
@@ -38,14 +38,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: "Update Homebrew and Install Azure CLI"
-        shell: bash
-        run: |
-          brew unlink python@3.12 && brew link --overwrite python@3.12
-          brew unlink python@3.11 && brew link --overwrite python@3.11
-          brew unlink python@3.10 && brew link --overwrite python@3.10
-          brew update && brew upgrade
-          brew install azure-cli
+      # - name: "Update Homebrew and Install Azure CLI"
+      #   shell: bash
+      #   run: |
+      #     brew unlink python@3.12 && brew link --overwrite python@3.12
+      #     brew unlink python@3.11 && brew link --overwrite python@3.11
+      #     brew unlink python@3.10 && brew link --overwrite python@3.10
+      #     brew update && brew upgrade
+      #     brew install azure-cli
 
       - name: "Install AutonomySim Dependencies"
         shell: bash

diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -101,20 +101,20 @@ done
 # Ensure LLVM and Vulkan are installed.
 if [ "$(uname)" = 'Darwin' ]; then
     echo 'Installing dependencies...'
+    NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/uninstall.sh)"
+    sudo rm -rf '/usr/local/bin/2to3' '/usr/local/bin/2to3-3.11'  # remove Python installs
     NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-    # remove existing Homebrew Python installs.
-    sudo rm -rf '/usr/local/bin/2to3' '/usr/local/bin/2to3-3.11'
+    eval "$(/opt/homebrew/bin/brew shellenv)"
+    export PATH="/usr/local/bin:${PATH}"
     brew update
-    echo 'Installing latest cURL version and configuring Homebrew to use it...'
+    brew upgrade
     brew install curl
-    HOMEBREW_FORCE_BREWED_CURL=1 brew config
-    #tee -a "${HOME}/.bash_profile" << EOM
     export HOMEBREW_CURL_PATH='/usr/local/opt/curl/bin/curl'
-    export PATH="/usr/local/bin:${PATH}"
     export PATH="/usr/local/opt/curl/bin:${PATH}"
-    #EOM
-    #source "${HOME}/.bash_profile"
-    brew install wget coreutils azure-cli "llvm@${CLANG_VERSION}"
+    HOMEBREW_FORCE_BREWED_CURL=1 brew config
+    echo 'Installing latest cURL version and configuring Homebrew to use it...'
+    brew install python@3.11 azure-cli
+    brew install wget coreutils "llvm@${CLANG_VERSION}"
 else
     echo 'Installing dependencies...'
     sudo add-apt-repository -y ppa:graphics-drivers/ppa