Merge pull request #235 from himkt/ci-doctor

ci: run brew doctor on CI
himkt · Mar 9, 2024 · e6aa1de · e6aa1de
2 parents 31a36d6 + 53e0ef2
commit e6aa1de
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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