Skip to content

Commit c258193

Browse files
author
Andrea Falzetti
committed
feat(jetbrains): add rider and clion
1 parent cd144de commit c258193

File tree

36 files changed

+970
-44
lines changed

36 files changed

+970
-44
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ jobs:
5757
echo $IDE_VERSION
5858
- name: Leeway build
5959
if: ${{ steps.ide-version.outputs.result }}
60+
env:
61+
LEEWAY_MAX_PROVENANCE_BUNDLE_SIZE: '8388608'
6062
run: |
6163
gcloud auth configure-docker --quiet
6264
export LEEWAY_WORKSPACE_ROOT=$(pwd)

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,21 @@ jobs:
6565
projectId: ${{ secrets.GCP_PROJECT_ID }}
6666
serviceAccountKey: ${{ secrets.GCP_SA_KEY }}
6767
slackWebhook: ${{ secrets.IDE_SLACK_WEBHOOK }}
68+
rider:
69+
uses: ./.github/workflows/jetbrains-auto-update-template.yml
70+
with:
71+
productId: rider
72+
productCode: RD
73+
secrets:
74+
projectId: ${{ secrets.GCP_PROJECT_ID }}
75+
serviceAccountKey: ${{ secrets.GCP_SA_KEY }}
76+
slackWebhook: ${{ secrets.IDE_SLACK_WEBHOOK }}
77+
clion:
78+
uses: ./.github/workflows/jetbrains-auto-update-template.yml
79+
with:
80+
productId: clion
81+
productCode: CL
82+
secrets:
83+
projectId: ${{ secrets.GCP_PROJECT_ID }}
84+
serviceAccountKey: ${{ secrets.GCP_SA_KEY }}
85+
slackWebhook: ${{ secrets.IDE_SLACK_WEBHOOK }}

WORKSPACE.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ defaultArgs:
1717
phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2022.2.3.tar.gz"
1818
rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2022.2.3.tar.gz"
1919
webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2022.2.3.tar.gz"
20+
riderDownloadUrl: "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.3.tar.gz"
21+
clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2022.2.3.tar.gz"
2022
REPLICATED_API_TOKEN: ""
2123
REPLICATED_APP: ""
2224
provenance:

components/BUILD.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ packages:
5454
- components/ide/jetbrains/image:rubymine-latest
5555
- components/ide/jetbrains/image:webstorm
5656
- components/ide/jetbrains/image:webstorm-latest
57+
- components/ide/jetbrains/image:rider
58+
- components/ide/jetbrains/image:rider-latest
59+
- components/ide/jetbrains/image:clion
60+
- components/ide/jetbrains/image:clion-latest
5761
- components/image-builder-bob:docker
5862
- components/image-builder-mk3:docker
5963
- components/local-app:docker

components/dashboard/src/settings/SelectIDE.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export default function SelectIDE(props: SelectIDEProps) {
9292
<>
9393
{allIdeOptions && (
9494
<>
95-
<div className={`my-4 gap-3 flex flex-wrap max-w-2xl`}>
95+
<div className={`my-4 gap-3 flex flex-wrap max-w-3xl`}>
9696
{allIdeOptions.map(([id, option]) => {
9797
const selected = defaultIde === id;
9898
const onSelect = () => actuallySetDefaultIde(id);

components/dashboard/src/settings/SelectIDEModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export default function (props: SelectIDEModalProps) {
4444
visible={visible}
4545
onClose={handleContinue}
4646
closeable={true}
47-
className="max-w-2xl"
47+
className="max-w-51.5"
4848
buttons={<button onClick={handleContinue}>Continue</button>}
4949
>
5050
<p className="text-gray-500 dark:text-gray-400 text-base pb-3">

components/dashboard/tailwind.config.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ module.exports = {
4242
112: "28rem",
4343
128: "32rem",
4444
},
45+
maxWidth: {
46+
// TODO(andreafalzetti): remove custom ide-modal class once we implement https://github.com/gitpod-io/gitpod/issues/13116
47+
51.5: "51.5rem",
48+
},
4549
},
4650
fontFamily: {
4751
sans: [

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,14 @@
283283
"webstorm": {
284284
"$ref": "#/definitions/jetbrainsProduct",
285285
"description": "Configure WebStorm integration"
286+
},
287+
"rider": {
288+
"$ref": "#/definitions/jetbrainsProduct",
289+
"description": "Configure Rider integration"
290+
},
291+
"clion": {
292+
"$ref": "#/definitions/jetbrainsProduct",
293+
"description": "Configure CLion integration"
286294
}
287295
}
288296
},

components/gitpod-protocol/go/gitpod-config-types.go

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/gitpod-protocol/src/protocol.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -801,6 +801,8 @@ export interface JetBrainsConfig {
801801
phpstorm?: JetBrainsProductConfig;
802802
rubymine?: JetBrainsProductConfig;
803803
webstorm?: JetBrainsProductConfig;
804+
rider?: JetBrainsProductConfig;
805+
clion?: JetBrainsProductConfig;
804806
}
805807
export interface JetBrainsProductConfig {
806808
prebuilds?: JetBrainsPrebuilds;

0 commit comments

Comments
 (0)