diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 94a9a0dca0..b191cab5a5 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -4,6 +4,12 @@ on:
   push:
     branches:
       - main
+  pull_request:
+    types: [closed]
+    branches:
+      - main
+
+if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.merged == true)
 
 jobs:
   build:
@@ -95,6 +101,14 @@ jobs:
           cd core
           npm ci
 
+      # 2.25 Run core tests
+      - name: Run core tests
+        run: |
+          cd core
+          npm run test
+        env:
+          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+
       # 2.5. Pre package
       - name: Set var for environment info
         shell: pwsh
@@ -214,6 +228,7 @@ jobs:
 
       # 3. Publish the extension to Open VSX Registry
       - name: Publish (Open VSX Registry)
+        continue-on-error: true
         run: |
           cd extensions/vscode
           npx ovsx publish -p ${{ secrets.VSX_REGISTRY_TOKEN }} --packagePath ../../alpine-x64/*.vsix ../../darwin-arm64/*.vsix ../../darwin-x64/*.vsix ../../linux-arm64/*.vsix ../../linux-armhf/*.vsix ../../linux-x64/*.vsix ../../win32-x64/*.vsix ../../win32-arm64/*.vsix