From e4df9526d2b089a844f2d35bb5748f7d3d87a417 Mon Sep 17 00:00:00 2001
From: Ricardo Costa <rcosta.ms358@gmail.com>
Date: Fri, 2 Oct 2026 15:44:54 +0100
Subject: [PATCH 1/2] ci: check branches and validate extension packaging

---
 .github/workflows/test.yml | 66 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000..5a47abf
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,66 @@
+name: Test
+
+on:
+  push:
+    branches: ['**']
+  pull_request:
+  workflow_call:
+
+concurrency:
+  group: test-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  checks:
+    name: Checks
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: client
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: npm
+          cache-dependency-path: client/package-lock.json
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Lint
+        run: npm run lint
+
+      - name: Type-check
+        run: npx tsc --noEmit
+
+      - name: Build server
+        working-directory: server
+        run: |
+          mvn -B package
+          mkdir -p ../client/server
+          cp target/language-server-liquidjava.jar ../client/server/
+
+      - name: Package extension
+        run: npx vsce package --out liquid-java.vsix
+
+      - name: Check packaged runtime files
+        run: |
+          unzip -Z1 liquid-java.vsix > /tmp/liquid-java-vsix-files.txt
+          grep -Fx 'extension/dist/server/language-server-liquidjava.jar' /tmp/liquid-java-vsix-files.txt
+          grep -Fx 'extension/media/webview.js' /tmp/liquid-java-vsix-files.txt

From 3043e40b2ed19d7935273daa98fe8e364e210aea Mon Sep 17 00:00:00 2001
From: Ricardo Costa <rcosta.ms358@gmail.com>
Date: Sun, 4 Oct 2026 15:31:27 +0100
Subject: [PATCH 2/2] Run required checks and align Java release validation

Co-authored-by: Codex <noreply@openai.com>
---
 .github/workflows/publish.yml | 2 +-
 .github/workflows/test.yml    | 1 -
 server/pom.xml                | 7 +------
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 225cb0d..f499530 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: 20
+          java-version: 21
           distribution: temurin
 
       - name: Setup Node.js
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5a47abf..c63c6f7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,7 +16,6 @@ permissions:
 jobs:
   checks:
     name: Checks
-    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
     runs-on: ubuntu-latest
 
     defaults:
diff --git a/server/pom.xml b/server/pom.xml
index 71d1296..31b050c 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -36,10 +36,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${pVersion.compiler}</version>
-                <configuration>
-					<source>20</source>
-					<target>20</target>
-				</configuration>
             </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -102,8 +98,7 @@
     <properties>
         <lsp4j.version>0.24.0</lsp4j.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>20</maven.compiler.source>
-		<maven.compiler.target>20</maven.compiler.target>
+		<maven.compiler.release>20</maven.compiler.release>
 		<!-- versions -->
 		<version.memcompiler>1.3.0</version.memcompiler>
 		<version.spoon>10.4.2</version.spoon>