From 27494d493bf8059e94b3074af6f6fa3747d72ca9 Mon Sep 17 00:00:00 2001
From: Steven Arcangeli <stevearc@stevearc.com>
Date: Mon, 28 Aug 2023 07:56:17 -0700
Subject: ci: merge workflows

---
 .github/workflows/install_nvim.sh |  2 +-
 .github/workflows/tests.yml       | 36 ++++++++++++++++++++++++++++++++++--
 .github/workflows/update-docs.yml | 35 -----------------------------------
 3 files changed, 35 insertions(+), 38 deletions(-)
 delete mode 100644 .github/workflows/update-docs.yml

(limited to '.github')

diff --git a/.github/workflows/install_nvim.sh b/.github/workflows/install_nvim.sh
index c5119dc..4c0203c 100644
--- a/.github/workflows/install_nvim.sh
+++ b/.github/workflows/install_nvim.sh
@@ -3,7 +3,7 @@ set -e
 PLUGINS="$HOME/.local/share/nvim/site/pack/plugins/start"
 mkdir -p "$PLUGINS"
 
-wget "https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim.appimage"
+wget "https://github.com/neovim/neovim/releases/download/${NVIM_TAG-stable}/nvim.appimage"
 chmod +x nvim.appimage
 ./nvim.appimage --appimage-extract >/dev/null
 rm -f nvim.appimage
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7e5b6e0..05424f3 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,7 +17,7 @@ jobs:
           sudo luarocks install luacheck
 
       - name: Run Luacheck
-        run: luacheck .
+        run: luacheck lua tests
 
   typecheck:
     name: typecheck
@@ -38,7 +38,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           version: v0.15.2
-          args: --check .
+          args: --check lua tests
 
   run_tests:
     strategy:
@@ -62,6 +62,37 @@ jobs:
         run: |
           bash ./run_tests.sh
 
+  update_docs:
+    name: Update docs
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Install Neovim and dependencies
+        env:
+          NVIM_TAG: v0.9.1
+        run: |
+          bash ./.github/workflows/install_nvim.sh
+
+      - name: Update docs
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COMMIT_MSG: |
+            [docgen] Update docs
+            skip-checks: true
+        run: |
+          git config user.email "actions@github"
+          git config user.name "Github Actions"
+          git remote set-url origin https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git
+          python -m pip install pyparsing==3.0.9
+          make doc
+          python scripts/main.py lint
+          git add README.md doc
+          # Only commit and push if we have changes
+          git diff --quiet && git diff --staged --quiet || (git commit -m "${COMMIT_MSG}"; git push origin HEAD:${GITHUB_REF})
+
   release:
     name: release
 
@@ -71,6 +102,7 @@ jobs:
       - stylua
       - typecheck
       - run_tests
+      - update_docs
     runs-on: ubuntu-22.04
     steps:
       - uses: google-github-actions/release-please-action@v3
diff --git a/.github/workflows/update-docs.yml b/.github/workflows/update-docs.yml
deleted file mode 100644
index 813e69c..0000000
--- a/.github/workflows/update-docs.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Update docs
-
-on: push
-
-jobs:
-  update-readme:
-    name: Update docs
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-
-      - name: Install Neovim and dependencies
-        env:
-          NVIM_TAG: v0.8.3
-        run: |
-          bash ./.github/workflows/install_nvim.sh
-
-      - name: Update docs
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          COMMIT_MSG: |
-            [docgen] Update docs
-            skip-checks: true
-        run: |
-          git config user.email "actions@github"
-          git config user.name "Github Actions"
-          git remote set-url origin https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git
-          python -m pip install pyparsing==3.0.9
-          python .github/main.py generate
-          python .github/main.py lint
-          git add README.md doc
-          # Only commit and push if we have changes
-          git diff --quiet && git diff --staged --quiet || (git commit -m "${COMMIT_MSG}"; git push origin HEAD:${GITHUB_REF})
-- 
cgit v1.2.3-70-g09d2