From 9780d22908823831741207a33bdf16e8da74c57f Mon Sep 17 00:00:00 2001
From: alexk111 <gh@alexkaul.com>
Date: Thu, 18 Jan 2024 15:08:43 +0400
Subject: [PATCH 1/4] Upd CI

---
 .github/workflows/ci.yml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fee1d927..cc416a72 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,20 @@ on:
 
 jobs:
   main:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        kind: ["linux", "windows", "macOS"]
+        include:
+          - kind: linux
+            os: ubuntu-18.04
+            target: linux-x64
+          - kind: windows
+            os: windows-latest
+            target: win-x64
+          - kind: macOS
+            os: macos-latest
+            target: mac-x64
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
 
@@ -23,9 +36,11 @@ jobs:
         run: yarn install
 
       - name: Run Linter
+        if: matrix.kind == 'linux'
         run: yarn run lint
 
       - name: Run Tests
+        if: matrix.kind == 'linux'
         run: yarn run test
 
       - name: Compile

From f9d929a4500f80dc23057f3fda0e302c9dbac3d6 Mon Sep 17 00:00:00 2001
From: alexk111 <gh@alexkaul.com>
Date: Thu, 18 Jan 2024 15:09:11 +0400
Subject: [PATCH 2/4] Remove baseUrl in swc config

---
 webpack.main.config.js     | 1 -
 webpack.preload.config.js  | 1 -
 webpack.renderer.config.js | 1 -
 3 files changed, 3 deletions(-)

diff --git a/webpack.main.config.js b/webpack.main.config.js
index e2ab664a..63a5af97 100644
--- a/webpack.main.config.js
+++ b/webpack.main.config.js
@@ -40,7 +40,6 @@ module.exports = {
             options: {
               jsc: {
                 target: configFileObj.target,
-                baseUrl: './src/',
                 paths: configFileObj.paths,
               },
             },
diff --git a/webpack.preload.config.js b/webpack.preload.config.js
index 09b5e7ba..ae02a7a1 100644
--- a/webpack.preload.config.js
+++ b/webpack.preload.config.js
@@ -40,7 +40,6 @@ module.exports = {
             options: {
               jsc: {
                 target: configFileObj.target,
-                baseUrl: './src/',
                 paths: configFileObj.paths,
               },
             },
diff --git a/webpack.renderer.config.js b/webpack.renderer.config.js
index edaf0c0e..774ab2e9 100644
--- a/webpack.renderer.config.js
+++ b/webpack.renderer.config.js
@@ -63,7 +63,6 @@ module.exports = {
             options: {
               jsc: {
                 target: configFileObj.target,
-                baseUrl: './src/',
                 paths: configFileObj.paths,
                 transform: {
                   react: {

From 51fca913fa476174acf3f645ae3ae035c2b6db3d Mon Sep 17 00:00:00 2001
From: alexk111 <gh@alexkaul.com>
Date: Thu, 18 Jan 2024 15:44:57 +0400
Subject: [PATCH 3/4] Update CI

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cc416a72..a24e7465 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
         kind: ["linux", "windows", "macOS"]
         include:
           - kind: linux
-            os: ubuntu-18.04
+            os: ubuntu-latest
             target: linux-x64
           - kind: windows
             os: windows-latest
@@ -24,7 +24,7 @@ jobs:
           - kind: macOS
             os: macos-latest
             target: mac-x64
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
 

From 4663611bba427ffd82df6916d2eb3cc08559886c Mon Sep 17 00:00:00 2001
From: alexk111 <gh@alexkaul.com>
Date: Thu, 18 Jan 2024 15:45:36 +0400
Subject: [PATCH 4/4] Upd CI

---
 .github/workflows/ci.yml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a24e7465..fee1d927 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,19 +11,6 @@ on:
 
 jobs:
   main:
-    strategy:
-      matrix:
-        kind: ["linux", "windows", "macOS"]
-        include:
-          - kind: linux
-            os: ubuntu-latest
-            target: linux-x64
-          - kind: windows
-            os: windows-latest
-            target: win-x64
-          - kind: macOS
-            os: macos-latest
-            target: mac-x64
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -36,11 +23,9 @@ jobs:
         run: yarn install
 
       - name: Run Linter
-        if: matrix.kind == 'linux'
         run: yarn run lint
 
       - name: Run Tests
-        if: matrix.kind == 'linux'
         run: yarn run test
 
       - name: Compile