From 53e0ef287dccc3006b58510ac1323b3a2c6c8487 Mon Sep 17 00:00:00 2001
From: himkt <himkt@klis.tsukuba.ac.jp>
Date: Sat, 9 Mar 2024 20:28:15 +0900
Subject: [PATCH] ci: run brew doctor on CI

ci: split step and use checkout@v4

ci: tap

ci: split setup

ci: exec zsh

ci: make zsh

ci: remove zplug

ci: make sheldon

ci: zsh_clean

ci: zsh

ci: brew-base

ci: brew list

ci: chsh

ci: sudo

ci: shell/term

ci: bugfix
---
 .github/workflows/main.yml      | 25 +++++++++++++++++--------
 Makefile                        |  1 -
 brew/config.d/optional/Brewfile |  3 +++
 zsh/bin/setup.sh                |  2 --
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1ed374a7..5f818197 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,16 +9,25 @@ jobs:
 
     strategy:
       matrix:
-        # os: [ubuntu-latest, macos-latest]
         os: [macos-latest]
 
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Build linuxbrew
-      run: |
-        cp -r $GITHUB_WORKSPACE $HOME/dotfiles && cd $HOME/dotfiles
-        make
-        make brew
-        make brew-optional
+      - uses: actions/checkout@v4
+
+      - name: setup
+        run: |
+          cp -r $GITHUB_WORKSPACE $HOME/dotfiles && cd $HOME/dotfiles
+          make
+
+      - name: make {brew,brew-optional}
+        run: |
+          make brew
+          make brew-base
+          make brew-optional
+
+      - name: zsh
+        run: |
+          make zsh
+          make sheldon
diff --git a/Makefile b/Makefile
index 9f9da144..1bb6f9e6 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,6 @@ tmux_clean:
 
 zsh_clean:
 	rm -rf $(HOME)/.zshrc
-	rm -rf $(HOME)/.config/zplug
 
 # =========================
 
diff --git a/brew/config.d/optional/Brewfile b/brew/config.d/optional/Brewfile
index 3da50253..b6b1d534 100644
--- a/brew/config.d/optional/Brewfile
+++ b/brew/config.d/optional/Brewfile
@@ -1,3 +1,6 @@
+tap 'ktr0731/evans'
+tap 'nextdns/tap'
+
 brew 'bat'
 brew 'coreutils'
 brew 'envchain'
diff --git a/zsh/bin/setup.sh b/zsh/bin/setup.sh
index 33f17f96..e6f4a877 100755
--- a/zsh/bin/setup.sh
+++ b/zsh/bin/setup.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
 
-git clone https://github.com/zplug/zplug $HOME/.config/zplug
-
 ln -s $PWD/zsh/config.d/zshrc $HOME/.zshrc
 mkdir -p $HOME/.config/dotfiles/zsh