From 6444286cbf3a37862feaa7ff86456dd948f5cf8b Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Sat, 10 Feb 2024 15:33:57 +0100
Subject: ci: fix invalid workflow

Context variables aren't always available, so we can't rely on them for
e.g. environment variables.

Also merge all install scripts into `script/ci-install.sh`, that way it
can be called the same way regardless of system.
---
 .github/workflows/test-queries.yml    | 6 +++---
 .github/workflows/tests.yml           | 2 +-
 .github/workflows/update-lockfile.yml | 2 +-
 .github/workflows/update-readme.yml   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/test-queries.yml b/.github/workflows/test-queries.yml
index 0d713c836..e1606f2fc 100644
--- a/.github/workflows/test-queries.yml
+++ b/.github/workflows/test-queries.yml
@@ -51,8 +51,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       CC: ${{ matrix.cc }}
-      NVIM: ${{ runner.os == 'Windows' && 'nvim-win64\\bin\\nvim.exe' || 'nvim' }}
-      ALLOWED_INSTALLATION_FAILURES: ${{ runner.os == 'Windows' && 'rnoweb' }}
+      NVIM: ${{ matrix.os == 'windows-latest' && 'nvim-win64\\bin\\nvim.exe' || 'nvim' }}
+      ALLOWED_INSTALLATION_FAILURES: ${{ matrix.os == 'windows-latest' && 'rnoweb' }}
     steps:
       - uses: actions/checkout@v4
       - uses: ilammy/msvc-dev-cmd@v1
@@ -65,7 +65,7 @@ jobs:
         env:
           NVIM_TAG: ${{ matrix.nvim_tag }}
         run: |
-          bash ./scripts/ci-install-${{ matrix.os }}.sh
+          bash ./scripts/ci-install.sh
 
       - name: Setup Parsers Cache
         id: parsers-cache
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8c4043417..b3858b5de 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -44,7 +44,7 @@ jobs:
         env:
           NVIM_TAG: stable
         run: |
-          bash ./scripts/ci-install-${{ matrix.os }}.sh
+          bash ./scripts/ci-install.sh
 
       - name: Setup Parsers Cache
         id: parsers-cache
diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index efcea9ee6..b163a3232 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -27,7 +27,7 @@ jobs:
           wget https://github.com/josephburnett/jd/releases/download/v1.7.1/jd-amd64-linux
           mv jd-amd64-linux /tmp/jd
           chmod +x /tmp/jd
-          bash scripts/ci-install-ubuntu-latest.sh
+          bash scripts/ci-install.sh
 
       - name: Update parsers
         env:
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index d8954e462..e68b43d50 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -23,7 +23,7 @@ jobs:
         env:
           NVIM_TAG: stable
         run: |
-          bash ./scripts/ci-install-ubuntu-latest.sh
+          bash ./scripts/ci-install.sh
 
       - name: Check README
         run: |
-- 
cgit v1.2.3-70-g09d2