From 606341a1396dc4d4264d8247696b6e508ac42e37 Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Mon, 8 Mar 2021 13:02:53 +0100
Subject: Remove query file workflow (tested now on all OS

---
 .../check-query-files-and-compilation.yml          | 61 ++++++++++++++++++++++
 .github/workflows/check_query_files.yml            | 30 -----------
 .github/workflows/test.yml                         | 61 ----------------------
 3 files changed, 61 insertions(+), 91 deletions(-)
 create mode 100644 .github/workflows/check-query-files-and-compilation.yml
 delete mode 100644 .github/workflows/check_query_files.yml
 delete mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/check-query-files-and-compilation.yml b/.github/workflows/check-query-files-and-compilation.yml
new file mode 100644
index 000000000..546d56157
--- /dev/null
+++ b/.github/workflows/check-query-files-and-compilation.yml
@@ -0,0 +1,61 @@
+name: Parser compilation and query file check
+
+on: [push, pull_request]
+
+jobs:
+  check_compilation_unix_like:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        cc: [ gcc, clang ]
+        exclude:
+          - os: macos-latest
+            cc: gcc
+
+        include:
+          - os: windows-latest
+            cc: cl
+
+          - os: macos-latest
+            cc: gcc-10
+
+    name: Parser compilation
+    runs-on: ${{ matrix.os }}
+    env:
+      CC: ${{ matrix.cc }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ilammy/msvc-dev-cmd@v1.5.0
+
+      - name: Install and prepare Neovim
+        run: |
+          bash ./scripts/ci-install-${{ matrix.os }}.sh
+
+      - name: Compile parsers Unix like
+        if: matrix.os != 'windows-latest'
+        run: |
+          nvim --headless -c "TSInstallSync all" -c "q"
+
+      - name: Check query files (Unix)
+        if: matrix.os != 'windows-latest'
+        run: ./nvim.appimage --headless -c "luafile ./scripts/check-queries.lua" -c "q"
+
+      - name: Compile parsers Windows
+        if: matrix.os == 'windows-latest'
+        run: |
+          C:\\tools\\neovim\\Neovim\\bin\\nvim.exe --headless -c "TSInstallSync all" -c "q"
+
+      - name: Post compile Windows
+        if: matrix.os == 'windows-latest'
+        run: cp -r ~/AppData/Local/nvim/pack/nvim-treesitter/start/nvim-treesitter/parser/* parser
+        shell: bash
+
+      - name: Check query files (Windows)
+        if: matrix.os == 'windows-latest'
+        run: C:\\tools\\neovim\\Neovim\\bin\\nvim.exe --headless -c "luafile ./scripts/check-queries.lua" -c "q"
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: parsers-${{ matrix.os }}-${{ matrix.cc }}-x86_64
+          path: parser/*
+
diff --git a/.github/workflows/check_query_files.yml b/.github/workflows/check_query_files.yml
deleted file mode 100644
index 45019dab6..000000000
--- a/.github/workflows/check_query_files.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Check loading of syntax files
-
-on: [push, pull_request]
-
-jobs:
-  luacheck:
-    name: Check Query Files
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-
-      - name: Prepare
-        run: |
-          sudo apt-get update
-          sudo add-apt-repository universe
-          wget https://github.com/neovim/neovim/releases/download/nightly/nvim.appimage
-          chmod u+x nvim.appimage
-          mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
-          ln -s $(pwd) ~/.local/share/nvim/site/pack/nvim-treesitter/start
-
-      - name: Compile parsers
-        run: ./nvim.appimage --headless -c "TSInstallSync all" -c "q"
-
-      - name: Check query files
-        run: ./nvim.appimage --headless -c "luafile ./scripts/check-queries.lua" -c "q"
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: parsers
-          path: parser/*
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index 3c4808bb1..000000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-name: Parser compilation and tests
-
-on: [push, pull_request]
-
-jobs:
-  check_compilation_unix_like:
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        cc: [ gcc, clang ]
-        exclude:
-          - os: macos-latest
-            cc: gcc
-
-        include:
-          - os: windows-latest
-            cc: cl
-
-          - os: macos-latest
-            cc: gcc-10
-
-    name: Parser compilation
-    runs-on: ${{ matrix.os }}
-    env:
-      CC: ${{ matrix.cc }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ilammy/msvc-dev-cmd@v1.5.0
-
-      - name: Install and prepare Neovim
-        run: |
-          bash ./scripts/ci-install-${{ matrix.os }}.sh
-
-      - name: Compile parsers Unix like
-        if: matrix.os != 'windows-latest'
-        run: |
-          nvim --headless -c "TSInstallSync all" -c "q"
-
-      - name: Check query files (Unix)
-        if: matrix.os != 'windows-latest'
-        run: ./nvim.appimage --headless -c "luafile ./scripts/check-queries.lua" -c "q"
-
-      - name: Compile parsers Windows
-        if: matrix.os == 'windows-latest'
-        run: |
-          C:\\tools\\neovim\\Neovim\\bin\\nvim.exe --headless -c "TSInstallSync all" -c "q"
-
-      - name: Post compile Windows
-        if: matrix.os == 'windows-latest'
-        run: cp -r ~/AppData/Local/nvim/pack/nvim-treesitter/start/nvim-treesitter/parser/* parser
-        shell: bash
-
-      - name: Check query files (Windows)
-        if: matrix.os != 'windows-latest'
-        run: ./nvim.appimage --headless -c "luafile ./scripts/check-queries.lua" -c "q"
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: parsers-${{ matrix.os }}-${{ matrix.cc }}-x86_64
-          path: parser/*
-
-- 
cgit v1.2.3-70-g09d2