From 7437d8183b8e6c4de30cfe169b324cf1255eadac Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Sat, 25 Apr 2020 15:19:14 -0600 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Set=20MINT=5FPATH=20so=20jenkins?= =?UTF-8?q?=20user=20can=20install=20to=20dir=20it=20owns?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 5 +---- Brewfile.lock.json | 4 ++-- script/bootstrap | 11 +++++++++++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.editorconfig b/.editorconfig index da22b23..e9582ee 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,8 +12,5 @@ insert_final_newline = true [*.md] trim_trailing_whitespace = false -[*.rb] -indent_size = 2 - -[*.yml] +[{script/*,*.rb,*.yml}] indent_size = 2 diff --git a/Brewfile.lock.json b/Brewfile.lock.json index 679b1ea..ebfb93f 100644 --- a/Brewfile.lock.json +++ b/Brewfile.lock.json @@ -44,9 +44,9 @@ "system": { "macos": { "catalina": { - "HOMEBREW_VERSION": "2.2.13-122-g20f7f26", + "HOMEBREW_VERSION": "2.2.13", "HOMEBREW_PREFIX": "/usr/local", - "Homebrew/homebrew-core": "7bab196596401ff4d88ae36c354ad4b2c7da43b7", + "Homebrew/homebrew-core": "474ad1d25ce77de5836bfbe9824716667f853797", "CLT": "11.4.1.0.1.1586360307", "Xcode": "11.4.1", "macOS": "10.15.4" diff --git a/script/bootstrap b/script/bootstrap index 130bc3d..938e390 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -11,11 +11,22 @@ main() { script/clean echo "==> 👢 Bootstrapping" + + # Install ruby tools bundle install + + # Install Mint and shellcheck brew bundle install --verbose + + # Set up mint cache to be relative to user HOME + export MINT_PATH=~/.mint/cache + mkdir -p $MINT_PATH mint bootstrap --verbose + + # Download and build project dependencies carthage bootstrap --platform macOS --cache-builds + # Old Xcode project sort script used for CocoaSeeds script/sort }