From 9cce22f4f3db683886b5c3e0a283425fa825b51a Mon Sep 17 00:00:00 2001 From: r0qs Date: Mon, 25 Mar 2024 18:12:05 +0100 Subject: [PATCH] Add eldarica to osx cache --- .circleci/config.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 13f0c499f549..0e37fe1341cc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -391,7 +391,7 @@ commands: name: Installing dependencies / Restoring dependency cache command: | if [[ -f ~/osx-dependencies-cached ]]; then - echo "Dependency flag exists. Removing /usr/local/ and /opt/homebrew/. These directories will be restored from cache." + echo "Dependency flag exists. Removing /usr/local/, /opt/homebrew/ and /opt/eldarica. These directories will be restored from cache." # CircleCI is providing the circleci cli tools via some kind of symlink magic. # So we just save the original symlinks and restore them later. @@ -406,6 +406,12 @@ commands: sudo mkdir -p /opt/homebrew/bin sudo chmod 777 /opt/{homebrew,homebrew/bin} fi + # Eldarica is installed in /opt/eldarica + if [[ -d /opt/eldarica ]]; then + sudo rm -rf /opt/eldarica + sudo mkdir /opt/eldarica + sudo chmod 777 /opt/eldarica + fi # under macos /usr/local itself is read-only, so we just remove its sub-directories. sudo rm -rf /usr/local/* sudo mkdir -p /usr/local/bin @@ -431,6 +437,8 @@ commands: # Homebrew is installed in /usr/local on intel macs, but in /opt/homebrew on apple silicon. - /usr/local - /opt/homebrew + - /opt/eldarica + - /etc/paths.d/10-eldarica - save_cache: key: osx-dependencies-cached-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }} paths: