Merge pull request #24 from mcchrish/dev

Build using github actions

.editorconfig

@@ -10,3 +10,7 @@ indent_style = tab
 
 [*.vim]
 indent_style = space
+
+[*.yml]
+indent_size = 2
+indent_style = space

.github/workflows/build.yml

@@ -0,0 +1,47 @@
+name: build
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      pull-requests: write
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Clone lush
+        run: git clone --depth 1 https://github.com/rktjmp/lush.nvim ~/.local/share/nvim/site/pack/zenbones/start/lush.nvim
+
+      - uses: rhysd/action-setup-vim@v1
+        with:
+          neovim: true
+          version: stable
+
+      - name: Setup git
+        run: |
+          git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+          printf 'BUILD_BRANCH=bot/build/%s\n' ${GITHUB_REF#refs/heads/} >> $GITHUB_ENV
+
+      - name: Checkout to build branch
+        run: git checkout -b ${BUILD_BRANCH}
+
+      - name: Run builder script
+        run: make
+
+      - name: Create PR
+        run: |
+          if ! [[ -z $(git status -s) ]]; then
+              git add autoload/lightline/colorscheme/ colors/ lua/lualine/ extras/
+              git commit -m "chore: rebuild artifacts"
+              git push --force https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY} ${BUILD_BRANCH}
+              gh pr create --fill --base ${GITHUB_REF#refs/heads/} --head ${BUILD_BRANCH} || true
+          fi

.github/workflows/doc.yml

@@ -1,43 +1,43 @@
 name: doc
 
 on:
-    push:
-        branches: [main]
+  push:
+    branches: [main]
 
 jobs:
-    vimdocgen:
-        runs-on: ubuntu-latest
+  vimdocgen:
+    runs-on: ubuntu-latest
 
-        permissions:
-            contents: write
-            pull-requests: write
-        env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      contents: write
+      pull-requests: write
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-        steps:
-            - uses: actions/checkout@v2
-            - name: Setup git
-              run: |
-                  git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
-                  git config --local user.name "github-actions[bot]"
-                  printf 'VIMDOC_BRANCH=bot/vimdoc/%s\n' ${GITHUB_REF#refs/heads/} >> $GITHUB_ENV
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup git
+        run: |
+          git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+          printf 'VIMDOC_BRANCH=bot/vimdoc/%s\n' ${GITHUB_REF#refs/heads/} >> $GITHUB_ENV
 
-            - name: Checkout to vimdoc branch
-              run: git checkout -b ${VIMDOC_BRANCH}
+      - name: Checkout to vimdoc branch
+        run: git checkout -b ${VIMDOC_BRANCH}
 
-            - name: panvimdoc
-              uses: kdheepak/panvimdoc@v2.7.1
-              with:
-                  # Output vimdoc project name
-                  vimdoc: zenbones
-                  pandoc: doc/zenbones.md
-                  description: "A collection of contrast-based vim/neovim colorschemes"
-                  version: "Vim v8.1 / Neovim 0.5.0"
-            - name: Create PR
-              run: |
-                  if ! [[ -z $(git status -s) ]]; then
-                      git add doc/zenbones.txt
-                      git commit -m "chore: generated vimdoc"
-                      git push --force https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY} ${VIMDOC_BRANCH}
-                      gh pr create --fill --base ${GITHUB_REF#refs/heads/} --head ${VIMDOC_BRANCH} || true
-                  fi
+      - name: panvimdoc
+        uses: kdheepak/panvimdoc@v2.7.1
+        with:
+          # Output vimdoc project name
+          vimdoc: zenbones
+          pandoc: doc/zenbones.md
+          description: "A collection of contrast-based vim/neovim colorschemes"
+          version: "Vim v8.1 / Neovim 0.5.0"
+      - name: Create PR
+        run: |
+          if ! [[ -z $(git status -s) ]]; then
+              git add doc/zenbones.txt
+              git commit -m "chore: generated vimdoc"
+              git push --force https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY} ${VIMDOC_BRANCH}
+              gh pr create --fill --base ${GITHUB_REF#refs/heads/} --head ${VIMDOC_BRANCH} || true
+          fi

lua/zenbones/specs/dark.lua

@@ -421,10 +421,10 @@ local function generate(p, opt)
 					-- LspDiagnosticsFloatingInformation    { }, -- Used to color "Information" diagnostic messages in diagnostics float
 					-- LspDiagnosticsFloatingHint           { }, -- Used to color "Hint" diagnostic messages in diagnostics float
 
-					LspDiagnosticsSignError                 { DiagnosticSignError }, -- Used for "Error" signs in sign column
-					LspDiagnosticsSignWarning               { DiagnosticSignWarn }, -- Used for "Warning" signs in sign column
-					LspDiagnosticsSignInformation           { DiagnosticSignInfo }, -- Used for "Information" signs in sign column
-					LspDiagnosticsSignHint                  { DiagnosticSignHint }, -- Used for "Hint" signs in sign column
+					LspDiagnosticsSignError                 { base.DiagnosticSignError }, -- Used for "Error" signs in sign column
+					LspDiagnosticsSignWarning               { base.DiagnosticSignWarn }, -- Used for "Warning" signs in sign column
+					LspDiagnosticsSignInformation           { base.DiagnosticSignInfo }, -- Used for "Information" signs in sign column
+					LspDiagnosticsSignHint                  { base.DiagnosticSignHint }, -- Used for "Hint" signs in sign column
 				}
 			end)
 			---@diagnostic enable: undefined-global

lua/zenbones/specs/light.lua

@@ -421,10 +421,10 @@ local function generate(p, opt)
 					-- LspDiagnosticsFloatingInformation    { }, -- Used to color "Information" diagnostic messages in diagnostics float
 					-- LspDiagnosticsFloatingHint           { }, -- Used to color "Hint" diagnostic messages in diagnostics float
 
-					LspDiagnosticsSignError                 { DiagnosticSignError }, -- Used for "Error" signs in sign column
-					LspDiagnosticsSignWarning               { DiagnosticSignWarn }, -- Used for "Warning" signs in sign column
-					LspDiagnosticsSignInformation           { DiagnosticSignInfo }, -- Used for "Information" signs in sign column
-					LspDiagnosticsSignHint                  { DiagnosticSignHint }, -- Used for "Hint" signs in sign column
+					LspDiagnosticsSignError                 { base.DiagnosticSignError }, -- Used for "Error" signs in sign column
+					LspDiagnosticsSignWarning               { base.DiagnosticSignWarn }, -- Used for "Warning" signs in sign column
+					LspDiagnosticsSignInformation           { base.DiagnosticSignInfo }, -- Used for "Information" signs in sign column
+					LspDiagnosticsSignHint                  { base.DiagnosticSignHint }, -- Used for "Hint" signs in sign column
 				}
 			end)
 			---@diagnostic enable: undefined-global

makefile

@@ -1,4 +1,5 @@
 make:
 	nvim --headless -u NORC \
+		--cmd 'set rtp+=.' \
 		--cmd 'lua require("zenbones.build").run()' \
 		--cmd 'q'