Merge branch 'main' into fix/IDE-134_update-ls-to-include-range-in-co…

…de-custom-scan-messages

.circleci/Dockerfile

@@ -31,6 +31,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
     jq \
     faketime \
     zip \
+    cmake \
     nodejs=$(apt-cache policy nodejs | grep nodesource | xargs | cut -d " " -f2)
 RUN node -v
 RUN apt-get auto-remove -y && apt-get clean -y && rm -rf /var/lib/apt/
@@ -74,5 +75,10 @@ ENV TEMP=/tmp
 ENV TMP=$TEMP
 ENV TMPDIR=$TEMP
 
+# install rust and convco
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+RUN ~/.cargo/bin/cargo install convco
+ENV PATH=/home/circleci/.cargo/bin:$PATH
+
 WORKDIR /
 ENTRYPOINT [""]

.circleci/config.yml

@@ -38,12 +38,12 @@ executors:
       - image: alpine:3.17
   docker-amd64:
     docker:
-      - image: bastiandoetsch209/cli-build:20231210-192113
+      - image: bastiandoetsch209/cli-build:20240214-145818
     working_directory: /mnt/ramdisk/snyk
     resource_class: large
   docker-arm64:
     docker:
-      - image: bastiandoetsch209/cli-build-arm64:20231210-192113
+      - image: bastiandoetsch209/cli-build-arm64:20240214-145818
     working_directory: /mnt/ramdisk/snyk
     resource_class: arm.large
   linux-ubuntu-mantic-amd64:
@@ -808,7 +808,9 @@ jobs:
           command: npm ci
       - run:
           name: Set version
-          command: make binary-releases/version binary-releases/fips/version
+          command: |
+            make binary-releases/version binary-releases/fips/version 
+            make ts-cli-binaries/version BINARY_RELEASES_FOLDER_TS_CLI=ts-cli-binaries
       - run:
           # required for one unit test (ts-binary-wrapper/test/unit/common.spec.ts:15:30)
           # consider removing this run
@@ -821,6 +823,7 @@ jobs:
           root: .
           paths:
             - binary-releases/*
+            - ts-cli-binaries/*
             - binary-releases/fips/*
             - node_modules/*
             - ts-binary-wrapper/*

.github/workflows/check-dependencies.yml

@@ -2,7 +2,7 @@ name: 'Check Dependencies'
 
 on:
   pull_request:
-    branches: [master]
+    branches: [master, main]
 
 jobs:
   check-dependencies:

.github/workflows/danger-zone.yml

@@ -1,7 +1,7 @@
 name: 'Danger Zone'
 on:
   pull_request:
-    branches: [master]
+    branches: [master, main]
 
 jobs:
   build: