From 4b2a91431b40cd4745f6f562fdc9600afc1a507d Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Mon, 31 Aug 2020 15:23:23 +0300
Subject: ci: fix windows job not finding bison

Instead of using the unpredictable chocolatey let's just handle it
ourselves. The versions are pinned but that's arguably good.

Fixes https://github.com/xkbcommon/libxkbcommon/issues/179
Signed-off-by: Ran Benita <ran@unusedvar.com>
---
 .github/workflows/main.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f23e77a..308f584 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -68,17 +68,15 @@ jobs:
       - uses: actions/setup-python@v1
         with:
           python-version: '3.7'
-      - uses: actions/cache@v2
-        with:
-          path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
-          key: ${{ runner.os }}-chocolatey-${{ matrix.os }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-chocolatey-${{ matrix.os }}-
-            ${{ runner.os }}-chocolatey-
       - name: Install dependencies
+        shell: powershell
         run: |
           python -m pip install --upgrade pip meson
-          choco install ninja winflexbison3 -y --no-progress --stop-on-first-failure
+          Invoke-WebRequest -Uri https://github.com/ninja-build/ninja/releases/download/v1.10.1/ninja-win.zip -OutFile ninja.zip
+          Invoke-WebRequest -Uri https://github.com/lexxmark/winflexbison/releases/download/v2.5.23/win_flex_bison-2.5.23.zip -OutFile win_flex_bison.zip
+          Expand-Archive -Path win_flex_bison.zip -DestinationPath bin
+          Expand-Archive -Path ninja.zip -DestinationPath bin
+          Write-Output ("::add-path::" + (Get-Location) + "./bin")
       - name: Setup
         shell: cmd
         run: |
-- 
cgit v1.2.1