feat(jetbrains): add rider and clion

.github/workflows/jetbrains-auto-update-template.yml

@@ -57,6 +57,8 @@ jobs:
           echo $IDE_VERSION
       - name: Leeway build
         if: ${{ steps.ide-version.outputs.result }}
+        env:
+          LEEWAY_MAX_PROVENANCE_BUNDLE_SIZE: '8388608'
         run: |
           gcloud auth configure-docker --quiet
           export LEEWAY_WORKSPACE_ROOT=$(pwd)

.github/workflows/jetbrains-auto-update.yml

@@ -65,3 +65,21 @@ jobs:
       projectId: ${{ secrets.GCP_PROJECT_ID }}
       serviceAccountKey: ${{ secrets.GCP_SA_KEY }}
       slackWebhook: ${{ secrets.IDE_SLACK_WEBHOOK }}
+  rider:
+    uses: ./.github/workflows/jetbrains-auto-update-template.yml
+    with:
+      productId: rider
+      productCode: RD
+    secrets:
+      projectId: ${{ secrets.GCP_PROJECT_ID }}
+      serviceAccountKey: ${{ secrets.GCP_SA_KEY }}
+      slackWebhook: ${{ secrets.IDE_SLACK_WEBHOOK }}
+  clion:
+    uses: ./.github/workflows/jetbrains-auto-update-template.yml
+    with:
+      productId: clion
+      productCode: CL
+    secrets:
+      projectId: ${{ secrets.GCP_PROJECT_ID }}
+      serviceAccountKey: ${{ secrets.GCP_SA_KEY }}
+      slackWebhook: ${{ secrets.IDE_SLACK_WEBHOOK }}

WORKSPACE.yaml

@@ -17,6 +17,8 @@ defaultArgs:
   phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2022.2.3.tar.gz"
   rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2022.2.3.tar.gz"
   webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2022.2.3.tar.gz"
+  riderDownloadUrl: "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.3.tar.gz"
+  clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2022.2.3.tar.gz"
   REPLICATED_API_TOKEN: ""
   REPLICATED_APP: ""
 provenance:

components/BUILD.yaml

@@ -54,6 +54,10 @@ packages:
       - components/ide/jetbrains/image:rubymine-latest
       - components/ide/jetbrains/image:webstorm
       - components/ide/jetbrains/image:webstorm-latest
+      - components/ide/jetbrains/image:rider
+      - components/ide/jetbrains/image:rider-latest
+      - components/ide/jetbrains/image:clion
+      - components/ide/jetbrains/image:clion-latest
       - components/image-builder-bob:docker
       - components/image-builder-mk3:docker
       - components/local-app:docker

components/gitpod-protocol/data/gitpod-schema.json

@@ -283,6 +283,14 @@
                 "webstorm": {
                     "$ref": "#/definitions/jetbrainsProduct",
                     "description": "Configure WebStorm integration"
+                },
+                "rider": {
+                    "$ref": "#/definitions/jetbrainsProduct",
+                    "description": "Configure Rider integration"
+                },
+                "clion": {
+                    "$ref": "#/definitions/jetbrainsProduct",
+                    "description": "Configure CLion integration"
                 }
             }
         },

components/gitpod-protocol/src/protocol.ts

@@ -802,6 +802,8 @@ export interface JetBrainsConfig {
     phpstorm?: JetBrainsProductConfig;
     rubymine?: JetBrainsProductConfig;
     webstorm?: JetBrainsProductConfig;
+    rider?: JetBrainsProductConfig;
+    clion?: JetBrainsProductConfig;
 }
 export interface JetBrainsProductConfig {
     prebuilds?: JetBrainsPrebuilds;

components/ide/jetbrains/image/BUILD.js

@@ -27,6 +27,14 @@ const ideConfigs = [
         name: "webstorm",
         productCode: "WS",
     },
+    {
+        name: "rider",
+        productCode: "RD",
+    },
+    {
+        name: "clion",
+        productCode: "CL",
+    },
 ];
 
 const packages = [];

components/ide/jetbrains/image/download.sh

@@ -7,3 +7,7 @@ mkdir backend && cd backend || exit
 curl -sSLo backend.tar.gz "$JETBRAINS_BACKEND_URL" && tar -xf backend.tar.gz --strip-components=1 && rm backend.tar.gz
 # enable shared indexes by default
 printf '\nshared.indexes.download.auto.consent=true' >> "bin/idea.properties"
+
+# TODO(andreafalzetti): this is a workaround to build Rider, as these files are supposed to be for MacOS and leeway does not like them
+rm -rf bin/JBDevice.framework
+rm -rf bin/Bridge.framework

components/ide/jetbrains/image/gha-update-image/index.js

@@ -49,6 +49,20 @@ const IDEs = [
         productType: "release",
         exampleRepo: "https://github.com/gitpod-io/template-jetbrains-webstorm",
     },
+    {
+        productName: "Rider",
+        productId: "rider",
+        productCode: "RD",
+        productType: "release",
+        exampleRepo: "https://github.com/gitpod-io/template-dotnet-core-cli-csharp",
+    },
+    {
+        productName: "CLion",
+        productId: "clion",
+        productCode: "CL",
+        productType: "release",
+        exampleRepo: "https://github.com/gitpod-io/template-cpp",
+    },
 ];
 
 (async () => {

components/ide/jetbrains/image/supervisor-ide-config_clion.json

@@ -0,0 +1,10 @@
+{
+    "entrypoint": "/ide-desktop/startup.sh",
+    "entrypointArgs": [ "{DESKTOPIDEPORT}", "clion", "Open in CLion" ],
+    "readinessProbe": {
+        "type": "http",
+        "http": {
+            "path": "/status"
+        }
+      }
+}

components/ide/jetbrains/image/supervisor-ide-config_rider.json

@@ -0,0 +1,10 @@
+{
+    "entrypoint": "/ide-desktop/startup.sh",
+    "entrypointArgs": [ "{DESKTOPIDEPORT}", "rider", "Open in Rider" ],
+    "readinessProbe": {
+        "type": "http",
+        "http": {
+            "path": "/status"
+        }
+      }
+}

components/server/src/ide-service.ts

@@ -59,6 +59,10 @@ export class IDEService {
                     productCode = "RM";
                 } else if (key === "webstorm") {
                     productCode = "WS";
+                } else if (key === "rider") {
+                    productCode = "RD";
+                } else if (key === "clion") {
+                    productCode = "CL";
                 }
                 const prebuilds = productCode && ws.config.jetbrains[key as keyof JetBrainsConfig]?.prebuilds;
                 if (prebuilds) {