diff --git a/.github/workflows/.dir-locals.el b/.github/workflows/.dir-locals.el deleted file mode 100644 index c735cbbe..00000000 --- a/.github/workflows/.dir-locals.el +++ /dev/null @@ -1 +0,0 @@ -((nil . ((github-actions-mode . t)))) diff --git a/.github/workflows/xcode-build.yml b/.github/workflows/xcode-build.yml index fc020cdd..a2b9a318 100644 --- a/.github/workflows/xcode-build.yml +++ b/.github/workflows/xcode-build.yml @@ -17,7 +17,7 @@ on: jobs: build: name: CutBox Build - runs-on: macos-12 + runs-on: macos-14 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }} diff --git a/Brewfile b/Brewfile deleted file mode 100644 index c7566616..00000000 --- a/Brewfile +++ /dev/null @@ -1,8 +0,0 @@ -brew "coreutils" -brew "node" unless system "which node" -brew "ripgrep" unless system "which rg" -brew "cmark" unless system "which cmark" -brew "cocoapods" unless system "which pod" -brew "carthage" unless system "which carthage" -# Custom llvm for coverage reports (unlinked) -brew "llvm" diff --git a/CutBox/Podfile b/CutBox/Podfile index 125882a2..4f8d64e1 100644 --- a/CutBox/Podfile +++ b/CutBox/Podfile @@ -1,5 +1,5 @@ abstract_target 'CutBoxAll' do - platform :osx, '12.0' + platform :osx, '14.0' pod 'RxSwift' diff --git a/bin/setup b/bin/setup index 99e6f441..e21fcfbb 100755 --- a/bin/setup +++ b/bin/setup @@ -68,8 +68,16 @@ npm_check() { } if [ -x "$(which brew)" ]; then - message "Running brew bundle, npm install and pip install -r requirements.txt" - brew bundle + message "Running brew installs, npm install and pip install -r requirements.txt" + + brew install coreutils + brew install node + brew install ripgrep + brew install cmark + brew install cocoapods + brew install carthage + brew install llvm + npm install pip install -r requirements.txt else