From c8efb70406f55d2696685c9392456be7824f4368 Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Fri, 12 May 2023 22:00:32 +0300
Subject: [PATCH] ci: bump runs-on versions

Mostly to bump to macos one which will hopefully fix CI issues there.

Signed-off-by: Ran Benita <ran@unusedvar.com>
---
 .github/workflows/github-release.yml | 2 +-
 .github/workflows/linux.yml          | 5 +++--
 .github/workflows/macos.yml          | 2 +-
 .github/workflows/windows.yml        | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml
index 2d6e496..16ba3ad 100644
--- a/.github/workflows/github-release.yml
+++ b/.github/workflows/github-release.yml
@@ -11,7 +11,7 @@ permissions: {}
 jobs:
   build:
     name: Automatically create GitHub release for tag
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     permissions:
       contents: write
     steps:
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index be22915..5ba828f 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -11,7 +11,7 @@ permissions: {}
 
 jobs:
   linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
     strategy:
@@ -33,7 +33,8 @@ jobs:
             libwayland-dev wayland-protocols bison graphviz
       - name: Setup
         run: |
-          meson setup build
+          # -gdwarf-4 - see https://github.com/llvm/llvm-project/issues/56550.
+          CFLAGS='-gdwarf-4' meson setup build
         env:
           CC: ${{ matrix.compiler }}
       - name: Build
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 4754b93..c57a0d7 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -11,7 +11,7 @@ permissions: {}
 
 jobs:
   macos:
-    runs-on: macos-10.15
+    runs-on: macos-12
     permissions:
       contents: read
     steps:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 8573eb3..101992d 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -11,7 +11,7 @@ permissions: {}
 
 jobs:
   windows:
-    runs-on: windows-2019
+    runs-on: windows-2022
     permissions:
       contents: read
     steps:
@@ -31,12 +31,12 @@ jobs:
       - name: Setup
         shell: cmd
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
           meson setup --backend=vs -Denable-wayland=false -Denable-x11=false -Denable-docs=false -Denable-xkbregistry=false build
       - name: Build
         shell: cmd
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
           meson compile -C build
       - name: Test
         run: