From 77349a23455ab028b9f9ca319ebeb9d9c825ce1e Mon Sep 17 00:00:00 2001
From: Danil Ovchinnikov <danil42worker@gmail.com>
Date: Tue, 16 Sep 2025 00:40:35 +0300
Subject: [PATCH 1/4] chore(ci): running tests

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

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2b96dc14..832f673e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,10 +3,10 @@ name: E2E and Unit tests
 on:
   pull_request:
     branches:
-      - master
+      - main
   push:
     branches:
-      - master
+      - main
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

From 53c34f7b33fd966938ac9cff62dddcb13494de9a Mon Sep 17 00:00:00 2001
From: Danil Ovchinnikov <danil42worker@gmail.com>
Date: Tue, 16 Sep 2025 00:43:13 +0300
Subject: [PATCH 2/4] build wasm

---
 .github/workflows/tests.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 832f673e..8b05d25d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -49,11 +49,14 @@ jobs:
           YARN_ENABLE_HARDENED_MODE: false
         run: yarn install --immutable
 
+      - name: Build WASM
+        run: yarn run grammar:wasm
+
       - name: Build Extension
-        run: yarn build
+        run: yarn run build
 
       - name: Run unit tests
-        run: yarn test
+        run: yarn run test
 
       - name: Run e2e tests
         if: matrix.os == 'ubuntu-latest'

From b3e779a7cf2d54b80b0eaaa06b1ff232cd75be1f Mon Sep 17 00:00:00 2001
From: Danil Ovchinnikov <danil42worker@gmail.com>
Date: Tue, 16 Sep 2025 01:01:40 +0300
Subject: [PATCH 3/4] setup EMSDK

---
 .github/workflows/tests.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8b05d25d..08d47d57 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -44,6 +44,12 @@ jobs:
           node-version: 22.x
           cache: "yarn"
 
+      - name: Setup EMSDK
+        uses: mymindstorm/setup-emsdk@v14
+        with:
+          version: 3.1.54
+          actions-cache-folder: "emsdk-cache"
+
       - name: Install dependencies
         env:
           YARN_ENABLE_HARDENED_MODE: false

From ba04b39b8f8b4d40b32beefe59a7de5b1025d570 Mon Sep 17 00:00:00 2001
From: Danil Ovchinnikov <danil42worker@gmail.com>
Date: Thu, 9 Oct 2025 12:42:51 +0300
Subject: [PATCH 4/4] update

---
 .github/workflows/grammars.yml | 1 +
 .github/workflows/tests.yml    | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/grammars.yml b/.github/workflows/grammars.yml
index eaf17827..e98db514 100644
--- a/.github/workflows/grammars.yml
+++ b/.github/workflows/grammars.yml
@@ -22,6 +22,7 @@ env:
 jobs:
   tree-sitter-grammars:
     name: Building tree-sitter (${{ matrix.os }})
+    if: ${{ false }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 08d47d57..6aab3e82 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -45,10 +45,13 @@ jobs:
           cache: "yarn"
 
       - name: Setup EMSDK
-        uses: mymindstorm/setup-emsdk@v14
+        uses: pyodide/setup-emsdk@v15
+        env:
+          EMSDK_VERSION: 4.0.15
         with:
-          version: 3.1.54
+          version: ${{ env.EMSDK_VERSION }}
           actions-cache-folder: "emsdk-cache"
+          cache-key: emsdk-cache-${{ runner.os }}-${{ runner.arch }}-${{ env.EMSDK_VERSION }}
 
       - name: Install dependencies
         env: