ci: make vscode job also run in pr (#4281)

Author: benfdking

.circleci/config.yml

@@ -20,23 +20,6 @@ orbs:
   path-filtering: circleci/path-filtering@1.2.0
 
 jobs:
-  vscode-extension-setup:
-    docker:
-      - image: cimg/node:20.19.0-browsers
-    resource_class: small
-    steps:
-      - checkout
-      - run:
-          name: Install VSCode extension dependencies
-          command: |
-            cd vscode/extension
-            npm ci
-      - run:
-          name: Run VSCode extension CI
-          command: |
-            cd vscode/extension
-            npm run ci
-
   publish:
     docker:
       - image: cimg/python:3.10
@@ -86,25 +69,25 @@ jobs:
           paths:
             - dist
   trigger_private_renovate:
-      docker:
-        - image: cimg/base:2021.11
-      resource_class: small
-      steps:
-        - run:
-            name: Trigger private renovate
-            command: |
-              curl --request POST \
-                --url $TOBIKO_PRIVATE_CIRCLECI_URL \
-                --header "Circle-Token: $TOBIKO_PRIVATE_CIRCLECI_KEY" \
-                --header "content-type: application/json" \
-                --data '{
-                  "branch":"main",
-                  "parameters":{
-                    "run_main_pr":false,
-                    "run_sqlmesh_commit":false,
-                    "run_renovate":true
-                    }
-                }'
+    docker:
+      - image: cimg/base:2021.11
+    resource_class: small
+    steps:
+      - run:
+          name: Trigger private renovate
+          command: |
+            curl --request POST \
+              --url $TOBIKO_PRIVATE_CIRCLECI_URL \
+              --header "Circle-Token: $TOBIKO_PRIVATE_CIRCLECI_KEY" \
+              --header "content-type: application/json" \
+              --data '{
+                "branch":"main",
+                "parameters":{
+                  "run_main_pr":false,
+                  "run_sqlmesh_commit":false,
+                  "run_renovate":true
+                  }
+              }'
 
 workflows:
   setup-workflow:
@@ -117,9 +100,6 @@ workflows:
             \.circleci/.*|Makefile|\.pre-commit-config\.yaml common true
             vscode/extensions/.* vscode true
           tag: "3.9"
-
-      - vscode-extension-setup:
-          <<: *on_main_or_tag_filter
       - gh-release:
           <<: *on_tag_filter
       - ui-build:

.circleci/continue_config.yml

@@ -34,6 +34,22 @@ commands:
             - run: circleci-agent step halt
 
 jobs:
+  vscode_test:
+    docker:
+      - image: cimg/node:20.19.1-browsers
+    resource_class: small
+    steps:
+      - checkout
+      - run:
+          name: Install VSCode extension dependencies
+          command: |
+            cd vscode/extension
+            npm ci
+      - run:
+          name: Run VSCode extension CI
+          command: |
+            cd vscode/extension
+            npm run ci
   doc_tests:
     docker:
       - image: cimg/python:3.10
@@ -127,7 +143,7 @@ jobs:
             - v1-nm-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Install packages
-          command: npm ci 
+          command: npm ci
       - save_cache:
           key: v1-nm-cache-{{ checksum "package-lock.json" }}
           paths:
@@ -137,37 +153,37 @@ jobs:
           command: npm --prefix web/client run test
 
   trigger_private_tests:
-      docker:
-        - image: cimg/python:3.12.0
-      resource_class: small
-      steps:
-        - checkout
-        - run:
-            name: Install setuptools scm
-            command: pip install setuptools_scm
-        - run:
-            name: Trigger private tests
-            command: |
-              export COMMIT_MESSAGE="$(git log --format=%s -n 1 $CIRCLE_SHA1)"
-              export FORMATTED_COMMIT_MESSAGE="${COMMIT_MESSAGE//\"/\\\"}"
-              # returns a version string like 0.1.0.dev11
-              export PACKAGE_VERSION="$(python ./.circleci/get_scm_version.py)"
-              curl --request POST \
-                --url $TOBIKO_PRIVATE_CIRCLECI_URL \
-                --header "Circle-Token: $TOBIKO_PRIVATE_CIRCLECI_KEY" \
-                --header "content-type: application/json" \
-                --data '{
-                  "branch":"main",
-                  "parameters":{
-                    "run_main_pr":false,
-                    "run_sqlmesh_commit":true,
-                    "sqlmesh_branch":"'$CIRCLE_BRANCH'",
-                    "sqlmesh_commit_author":"'$CIRCLE_USERNAME'",
-                    "sqlmesh_commit_hash":"'$CIRCLE_SHA1'",
-                    "sqlmesh_commit_message":"'"$FORMATTED_COMMIT_MESSAGE"'",
-                    "sqlmesh_package_version":"'$PACKAGE_VERSION'"
-                    }
-                }'
+    docker:
+      - image: cimg/python:3.12.0
+    resource_class: small
+    steps:
+      - checkout
+      - run:
+          name: Install setuptools scm
+          command: pip install setuptools_scm
+      - run:
+          name: Trigger private tests
+          command: |
+            export COMMIT_MESSAGE="$(git log --format=%s -n 1 $CIRCLE_SHA1)"
+            export FORMATTED_COMMIT_MESSAGE="${COMMIT_MESSAGE//\"/\\\"}"
+            # returns a version string like 0.1.0.dev11
+            export PACKAGE_VERSION="$(python ./.circleci/get_scm_version.py)"
+            curl --request POST \
+              --url $TOBIKO_PRIVATE_CIRCLECI_URL \
+              --header "Circle-Token: $TOBIKO_PRIVATE_CIRCLECI_KEY" \
+              --header "content-type: application/json" \
+              --data '{
+                "branch":"main",
+                "parameters":{
+                  "run_main_pr":false,
+                  "run_sqlmesh_commit":true,
+                  "sqlmesh_branch":"'$CIRCLE_BRANCH'",
+                  "sqlmesh_commit_author":"'$CIRCLE_USERNAME'",
+                  "sqlmesh_commit_hash":"'$CIRCLE_SHA1'",
+                  "sqlmesh_commit_message":"'"$FORMATTED_COMMIT_MESSAGE"'",
+                  "sqlmesh_package_version":"'$PACKAGE_VERSION'"
+                  }
+              }'
 
   engine_tests_docker:
     parameters:
@@ -271,9 +287,9 @@ workflows:
                 - clickhouse-cloud
                 - athena
           filters:
-           branches:
-             only:
-               - main
+            branches:
+              only:
+                - main
       - trigger_private_tests:
           requires:
             - style_and_cicd_tests
@@ -283,4 +299,5 @@ workflows:
                 - main
       - ui_style
       - ui_test
+      - vscode_test
       - migration_test