From 555f105c6221c670829990f28d3f6f8f45337715 Mon Sep 17 00:00:00 2001 From: Yasmin Teles Date: Sat, 9 Mar 2024 14:26:24 -0300 Subject: [PATCH] fix: remove default gitconfig at macOS --- .github/workflows/health-check.yml | 46 ++++-------------------------- brew/Brewfile | 2 +- install.sh | 14 ++++----- 3 files changed, 13 insertions(+), 49 deletions(-) diff --git a/.github/workflows/health-check.yml b/.github/workflows/health-check.yml index 04c3e55..f4417a5 100644 --- a/.github/workflows/health-check.yml +++ b/.github/workflows/health-check.yml @@ -20,50 +20,14 @@ jobs: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} Tests: - strategy: - matrix: - os: [ubuntu-latest, macos-12, macos-13, macos-14] - include: - - os: macOS-12 - shell: bash - - os: macOS-13 - shell: bash - - os: macOS-14 - shell: bash - - os: ubuntu-latest - shell: bash - runs-on: ${{ matrix.os }} - defaults: - run: - shell: ${{ matrix.shell }} + runs-on: macos-14 + timeout-minutes: 50 steps: - - name: Clean up linuxOS - if: runner.os != 'macOS' - run: sudo apt-get install build-essential - - - name: Cleanup macOS - if: runner.os == 'macOS' - run: | - sudo rm -rf /Applications/Xcode.app \ - /Library/Developer/CommandLineTools - sudo xcode-select --reset - - - name: Install Homebrew - run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" - env: - NONINTERACTIVE: 1 - - name: Set up Homebrew PATH - run: | - if [[ "${{ runner.os }}" = "macOS" ]] - then - echo "/usr/local/bin:/usr/bin:/bin" >> "${GITHUB_PATH}" - else - echo "/home/linuxbrew/.linuxbrew/bin:/usr/bin:/bin" >> "${GITHUB_PATH}" - fi + run: echo "/usr/local/bin:/usr/bin:/bin" >> "${GITHUB_PATH}" - - name: Check Homebrew - run: brew --config + - name: Homebrew install + run: brew reinstall git - name: Run install script run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/YasminTeles/dotfiles/main/install.sh)" diff --git a/brew/Brewfile b/brew/Brewfile index 8cdffe1..0edc9ec 100644 --- a/brew/Brewfile +++ b/brew/Brewfile @@ -46,9 +46,9 @@ cask "figma" cask "postman" # Productivity apps -cask "notion-calendar" cask "notion" cask "spotify" +cask "cron" # Communication cask "zoom" diff --git a/install.sh b/install.sh index b36c2bd..9afa997 100644 --- a/install.sh +++ b/install.sh @@ -24,26 +24,26 @@ printf "\nPlease wait! It will configure your environment.\n" step_msg "Creating the Projects folder" mkdir ~/Projects -# -- Homebrew ----------------------------------------------------------------- -step_msg "Installing homebrew" -brew update -brew install git stow +# -- Dependencies ----------------------------------------------------------------- +step_msg "Installing dependencies" +brew install stow # -- Dotfiles ----------------------------------------------------------------- step_msg "Setting up dotfiles" -git clone https://github.com/YasminTeles/dotfiles.git ~/.dotfiles +git clone https://github.com/YasminTeles/dotfiles.git ~/.dotfiles >/dev/null cd ~/.dotfiles +rm -rf ~/.gitconfig stow --dotfiles git ssh brew # -- Productivity Apps --------------------------------------------------------- step_msg "Installing the productivity apps" -brew bundle install --file=~/Brewfile +brew bundle install --file=~/Brewfile >/dev/null # -- Oh My Zsh ----------------------------------------------------------------- step_msg "Installing the Oh My Zsh" # chsh -s $(which zsh) -sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended +sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended >/dev/null rm -rf ~/.zshrc stow --dotfiles zsh echo "My current shell is $SHELL."