From 56d484f2a6c91693d26f3e27db6bd9bb5870ce3c Mon Sep 17 00:00:00 2001
From: Ein Verne <einverne@gmail.com>
Date: Tue, 2 Nov 2021 18:53:29 +0800
Subject: [PATCH] Fix ci and update ubuntu bootstrap config

---
 .github/workflows/setup.yml | 21 ++++++++++++++++-----
 config/bootstrap.conf.yml   | 11 +----------
 config/packages.conf.yml    |  9 +++++++++
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/setup.yml b/.github/workflows/setup.yml
index 07e5399..3a57d8f 100644
--- a/.github/workflows/setup.yml
+++ b/.github/workflows/setup.yml
@@ -1,8 +1,19 @@
 name: build
 on: [push, pull_request]
 jobs:
-  ci:
-    name: bootstrap
+  ubuntu:
+    name: ubuntu-bootstrap
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: build
+      env:
+        CI_MODE: true
+      run: |
+        make bootstrap
+        make tmux
+  macos:
+    name: macos-bootstrap
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@master
@@ -13,7 +24,7 @@ jobs:
         make
         make bootstrap
         make dotfiles
-        make macos
-        make asdf
-        make brew
+        #make macos
+        #make asdf
+        #make brew
         make tmux
diff --git a/config/bootstrap.conf.yml b/config/bootstrap.conf.yml
index 205403c..d07e4a6 100644
--- a/config/bootstrap.conf.yml
+++ b/config/bootstrap.conf.yml
@@ -1,9 +1,3 @@
-- brew:
-  - git
-  - mackup
-  - mas
-  - zsh
-
 # Setup zinit
 - create:
   - ~/.zinit
@@ -14,7 +8,7 @@
     command: |
       if cd ~/.zinit/bin;
       then git pull;
-      else git clone https://github.com/zdharma/zinit.git ~/.zinit/bin; fi
+      else git clone https://github.com/zdharma-continuum/zinit.git ~/.zinit/bin; fi
 
 # Change default shell to zsh
 - shell:
@@ -34,6 +28,3 @@
       }
 
       update_shell
-
-- cask:
-  - syncthing
diff --git a/config/packages.conf.yml b/config/packages.conf.yml
index 2348b8f..8936ef2 100644
--- a/config/packages.conf.yml
+++ b/config/packages.conf.yml
@@ -1,2 +1,11 @@
+- brew:
+  - git
+  - mackup
+  - mas
+  - zsh
+
+- cask:
+  - syncthing
+
 - brewfile:
     - ~/.Brewfile