Merge remote-tracking branch 'origin/master' into linux_build

# Conflicts:
#	.github/workflows/tests.yml

.github/workflows/tests.yml

@@ -17,8 +17,8 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - windows-latest
-          - ubuntu-latest
+          # - windows-latest
+          - ubuntu-22.04 # TODO: Use latest when https://github.com/electron/electron/issues/42510 is fixed
           # - macos-latest
 
     runs-on: ${{ matrix.os }}
@@ -38,7 +38,7 @@ jobs:
       # I ran into problems trying to run an electron window in ubuntu due to a missing graphics server.
       # That's why this special command for Ubuntu is here
       - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:e2e
-        if: matrix.os == 'ubuntu-latest'
+        if: startsWith(matrix.os, 'ubuntu')
 
       - run: yarn test:e2e
-        if: matrix.os != 'ubuntu-latest'
+        if: ${{ !startsWith(matrix.os, 'ubuntu') }}