From b36228f7ab1640551b36e58ff94038897e027ae7 Mon Sep 17 00:00:00 2001
From: Andrei Neculau <andrei.neculau@gmail.com>
Date: Fri, 29 Oct 2021 08:20:09 +0200
Subject: [PATCH 1/3] github: test windows-2022

---
 .github/workflows.src/main-matrix.js | 3 ++-
 .github/workflows/main.yml           | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows.src/main-matrix.js b/.github/workflows.src/main-matrix.js
index c806866a9..1da0c7f3c 100644
--- a/.github/workflows.src/main-matrix.js
+++ b/.github/workflows.src/main-matrix.js
@@ -18,7 +18,8 @@ let matrixOs = {
     'macos-11'
   ],
   windows: [
-    'windows-2019'
+    'windows-2019',
+    'windows-2022'
   ]
 };
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cd337bccc..551290aa0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -446,6 +446,7 @@ jobs:
       matrix:
         os:
           - windows-2019
+          - windows-2022
         yp_ci_brew_install:
           - minimal
     name: 'main-${{ matrix.yp_ci_brew_install }}-${{ matrix.os }}'

From 2d733636e3ef4f3fa9a7fe71e7a522b173cba9af Mon Sep 17 00:00:00 2001
From: Andrei Neculau <andrei.neculau@gmail.com>
Date: Fri, 29 Oct 2021 13:37:18 +0200
Subject: [PATCH 2/3] make sure that wsl.conf changes are applied

---
 .github/workflows.src/main-jobs.js | 5 ++++-
 .github/workflows/main.yml         | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows.src/main-jobs.js b/.github/workflows.src/main-jobs.js
index 6cdfb2728..c71d39251 100644
--- a/.github/workflows.src/main-jobs.js
+++ b/.github/workflows.src/main-jobs.js
@@ -72,7 +72,10 @@ wslSteps.push({
     'wsl bash -c "sudo echo \\"${WSLUSER} ALL=(ALL) NOPASSWD:ALL\\" >> /etc/sudoers"',
     '# Use wsl.conf to fix error: chmod on .git/config.lock failed: Operation not permitted',
     '# See https://gist.github.com/shakahl/8b6c969768b3a54506c0fc4905d729a0',
-    'wsl bash -c "sudo cp priv/wsl.conf /etc/wsl.conf && sudo chmod 0644 /etc/wsl.conf"'
+    'wsl bash -c "sudo cp priv/wsl.conf /etc/wsl.conf && sudo chmod 0644 /etc/wsl.conf"',
+    // Need to shutdown wsl, in order to apply the wsl.conf config
+    // https://github.com/MicrosoftDocs/WSL/blob/master/WSL/wsl-config.md
+    'wsl --shutdown'
   ], '\n')
 });
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 551290aa0..2219b4578 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -585,6 +585,8 @@ jobs:
           # See https://gist.github.com/shakahl/8b6c969768b3a54506c0fc4905d729a0
 
           wsl bash -c "sudo cp priv/wsl.conf /etc/wsl.conf && sudo chmod 0644 /etc/wsl.conf"
+
+          wsl --shutdown
       - shell: bash
         run: bin/wsl-bash -c "./.ci.sh before_install"
       - shell: bash

From cb711ee4ef164f51370916dfca937ce91c399845 Mon Sep 17 00:00:00 2001
From: Andrei Neculau <andrei.neculau@gmail.com>
Date: Fri, 29 Oct 2021 13:38:14 +0200
Subject: [PATCH 3/3] add another reference to wsl config

---
 priv/wsl.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/priv/wsl.conf b/priv/wsl.conf
index adc6af952..1cabbec19 100644
--- a/priv/wsl.conf
+++ b/priv/wsl.conf
@@ -1,4 +1,5 @@
 # see https://devblogs.microsoft.com/commandline/automatically-configuring-wsl/
+# see https://github.com/MicrosoftDocs/WSL/blob/master/WSL/wsl-config.md
 
 # DEFAULTS
 # [automount]