Skip to content

Commit dcc6e40

Browse files
shalom938shalom938
authored
Merge pull request #2198 from digma-ai/support-2024.2-eap
Support 2024.2 eap Closes #2167
2 parents b3c14f6 + df4a356 commit dcc6e40

File tree

111 files changed

+1670
-1831
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+1670
-1831
lines changed

‎.github/workflows/build-branches.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
build-workflow:
1010
strategy:
1111
matrix:
12-
profile: [ p223, p231, p232, p233, p241 ]
12+
profile: [ p231, p232, p233, p241 ]
1313
uses: ./.github/workflows/build-workflow.yml
1414
with:
1515
build-profile: ${{ matrix.profile }}
@@ -20,7 +20,7 @@ jobs:
2020
# plugin-verifier-workflow:
2121
# strategy:
2222
# matrix:
23-
# profile: [ p223, p231, p232, p233 ]
23+
# profile: [ p231, p232, p233, p241 ]
2424
# uses: ./.github/workflows/plugin-verifier-workflow.yml
2525
# with:
2626
# build-profile: ${{ matrix.profile }}

‎.github/workflows/build-main.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
build-workflow:
88
strategy:
99
matrix:
10-
profile: [ p223, p231, p232, p233, p241 ]
10+
profile: [ p231, p232, p233, p241 ]
1111
uses: ./.github/workflows/build-workflow.yml
1212
with:
1313
build-profile: ${{ matrix.profile }}
@@ -18,19 +18,20 @@ jobs:
1818
build-workflow-with-rider:
1919
strategy:
2020
matrix:
21-
profile: [ p223, p231, p232, p233, p241 ]
21+
profile: [ p231, p232, p233, p241 ]
2222
uses: ./.github/workflows/build-workflow.yml
2323
with:
2424
build-profile: ${{ matrix.profile }}
2525
ref-name: ${{ github.ref_name }}
2626
build-with-rider: true
2727
secrets: inherit
2828

29+
## todo : add plugin verifier for rider
2930
plugin-verifier-workflow:
3031
needs: [ build-workflow,build-workflow-with-rider ]
3132
strategy:
3233
matrix:
33-
profile: [ p223, p231, p232, p233, p241 ]
34+
profile: [ p231, p232, p233, p241 ]
3435
uses: ./.github/workflows/plugin-verifier-workflow.yml
3536
with:
3637
build-profile: ${{ matrix.profile }}

‎.github/workflows/build-pull-request.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
build-workflow:
99
strategy:
1010
matrix:
11-
profile: [ p223, p231, p232, p233, p241 ]
11+
profile: [ p231, p232, p233, p241 ]
1212
uses: ./.github/workflows/build-workflow.yml
1313
with:
1414
build-profile: ${{ matrix.profile }}
@@ -19,7 +19,7 @@ jobs:
1919
build-workflow-with-rider:
2020
strategy:
2121
matrix:
22-
profile: [ p223, p231, p232, p233, p241 ]
22+
profile: [ p231, p232, p233, p241 ]
2323
uses: ./.github/workflows/build-workflow.yml
2424
with:
2525
build-profile: ${{ matrix.profile }}
@@ -31,7 +31,7 @@ jobs:
3131
needs: [ build-workflow,build-workflow-with-rider ]
3232
strategy:
3333
matrix:
34-
profile: [ p223, p231, p232, p233, p241 ]
34+
profile: [ p231, p232, p233, p241 ]
3535
uses: ./.github/workflows/plugin-verifier-workflow.yml
3636
with:
3737
build-profile: ${{ matrix.profile }}

‎.github/workflows/build-workflow.yml‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,21 @@ jobs:
3030
remove-haskell: true
3131

3232
- name: Fetch Sources
33-
uses: actions/checkout@v3
33+
uses: actions/checkout@v4
3434
with:
3535
ref: ${{ inputs.ref-name }}
3636

3737
- name: Setup Java
38-
uses: actions/setup-java@v3
38+
uses: actions/setup-java@v4
3939
with:
4040
java-version: '17'
4141
distribution: 'corretto'
4242

4343
- name: Setup dotnet
44-
uses: actions/setup-dotnet@v2
44+
uses: actions/setup-dotnet@v4
4545
with:
4646
dotnet-version: |
47-
6.0.411
47+
8.0.301
4848
4949
## wrapper-validation-action fails too often with this error https://github.com/gradle/wrapper-validation-action/issues/40
5050
## we don't need it because we usually don't have contributors replacing it
@@ -56,20 +56,28 @@ jobs:
5656
if: ${{ inputs.build-with-rider != 'true' }}
5757
env:
5858
POSTHOG_TOKEN_URL: ${{ secrets.POSTHOG_TOKEN_URL }}
59-
run: ./gradlew clean test buildPlugin --no-configuration-cache -PbuildProfile=${{ inputs.build-profile }} -PdoNotDownloadSources=true
59+
run: ./gradlew clean test buildPlugin --no-configuration-cache -PbuildProfile=${{ inputs.build-profile }} -PbuildSearchableOptions=true
6060

6161
- name: Build Plugin with Rider
6262
if: ${{ inputs.build-with-rider == 'true' }}
6363
env:
6464
POSTHOG_TOKEN_URL: ${{ secrets.POSTHOG_TOKEN_URL }}
65-
run: ./gradlew clean test buildPlugin --no-configuration-cache -PbuildWithRider=true -PbuildProfile=${{ inputs.build-profile }} -PdoNotDownloadSources=true
65+
run: ./gradlew clean test buildPlugin --no-configuration-cache -PbuildWithRider=true -PbuildProfile=${{ inputs.build-profile }} -PbuildSearchableOptions=true
66+
67+
- name: Export Version
68+
id: exportversion
69+
shell: bash
70+
run: |
71+
VERSION=$(cat version.properties |grep "version="|cut -d= -f2)
72+
echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
6673
6774
- name: Find posthog url
6875
id: posthog
6976
shell: bash
7077
run: |
78+
IJ_RELEASE_NUMBER=$(echo "${{ inputs.build-profile }}"|cut -c 2-)
7179
cd ${{ github.workspace }}/build/libs
72-
FILENAME=`ls instrumented-digma-intellij-plugin*.jar`
80+
FILENAME=`ls digma-intellij-plugin-${{ steps.exportversion.outputs.version }}+$IJ_RELEASE_NUMBER.jar`
7381
unzip -q "$FILENAME" -d content
7482
URL=$(cat ./content/posthog-token-url.txt)
7583
echo "url=${URL}" >> "$GITHUB_OUTPUT"
@@ -80,7 +88,7 @@ jobs:
8088

8189
- name: Verify posthog url exists
8290
if: ${{ steps.posthog.outputs.url == '' }}
83-
uses: actions/github-script@v3
91+
uses: actions/github-script@v7
8492
with:
8593
script: |
8694
core.setFailed('posthog url is empty')
@@ -97,7 +105,7 @@ jobs:
97105
98106
- name: Upload Artifact
99107
if: ${{ inputs.build-with-rider != 'true' }}
100-
uses: actions/upload-artifact@v3
108+
uses: actions/upload-artifact@v4
101109
with:
102110
name: ${{ steps.artifact.outputs.filename }}
103111
path: ./build/distributions/content/*/*
@@ -107,7 +115,7 @@ jobs:
107115
##todo: add other modules test reports
108116
- name: Collect Tests Result
109117
if: ${{ inputs.build-with-rider != 'true' || failure() }}
110-
uses: actions/upload-artifact@v3
118+
uses: actions/upload-artifact@v4
111119
with:
112120
name: tests-result-${{ inputs.build-profile }}
113121
path: ${{ github.workspace }}/ide-common/build/reports/tests

‎.github/workflows/plugin-verifier-workflow.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,28 +32,28 @@ jobs:
3232
remove-haskell: true
3333

3434
- name: Fetch Sources
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636
with:
3737
ref: ${{ inputs.ref-name }}
3838

3939
- name: Setup Java
40-
uses: actions/setup-java@v3
40+
uses: actions/setup-java@v4
4141
with:
4242
java-version: '17'
4343
distribution: 'corretto'
4444

4545
- name: Setup dotnet
46-
uses: actions/setup-dotnet@v2
46+
uses: actions/setup-dotnet@v4
4747
with:
4848
dotnet-version: |
49-
6.0.411
49+
8.0.301
5050
5151
- name: Run Plugin Verifier
52-
run: ./gradlew runPluginVerifier --no-configuration-cache -PbuildProfile=${{ inputs.build-profile }} -PdoNotDownloadSources=true
52+
run: ./gradlew buildPlugin verifyPlugin -PbuildProfile=${{ inputs.build-profile }}
5353

5454
- name: Collect Plugin Verifier Result
5555
if: ${{ inputs.build-with-rider != 'true' }}
56-
uses: actions/upload-artifact@v3
56+
uses: actions/upload-artifact@v4
5757
with:
5858
name: pluginVerifier-result-${{ inputs.build-profile }}
5959
path: ${{ github.workspace }}/build/reports/pluginVerifier

‎.github/workflows/publish-to-jetbrains-and-increment-version.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
publish-workflow:
1414
strategy:
1515
matrix:
16-
profile: [ p223, p231, p232, p233, p241 ]
16+
profile: [ p231, p232, p233, p241 ]
1717
uses: ./.github/workflows/publish-workflow.yml
1818
with:
1919
build-profile: ${{ matrix.profile }}
@@ -27,23 +27,23 @@ jobs:
2727
runs-on: ubuntu-22.04
2828
steps:
2929
- name: Checkout main branch
30-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
3131
with:
3232
ref: main
3333
fetch-depth: 0
3434
token: ${{ secrets.GH_ADMIN_TOKEN }}
3535

3636
- name: Setup Java
37-
uses: actions/setup-java@v3
37+
uses: actions/setup-java@v4
3838
with:
3939
java-version: '17'
4040
distribution: 'corretto'
4141

4242
- name: Setup dotnet
43-
uses: actions/setup-dotnet@v2
43+
uses: actions/setup-dotnet@v4
4444
with:
4545
dotnet-version: |
46-
6.0.411
46+
8.0.301
4747
4848
- name: Export Changelog
4949
id: exportchangelog
@@ -65,13 +65,13 @@ jobs:
6565
env:
6666
CHANGELOG: ${{ steps.exportchangelog.outputs.changelog }}
6767
run: |
68-
./gradlew --no-configuration-cache -PdoNotDownloadSources=true patchChangelog --release-note="$CHANGELOG"
68+
./gradlew --no-configuration-cache patchChangelog --release-note="$CHANGELOG"
6969
7070
7171
- name: Increment version
7272
run: |
73-
./gradlew --no-configuration-cache -PdoNotDownloadSources=true incrementSemanticVersionPatch
74-
./gradlew --no-configuration-cache -PdoNotDownloadSources=true printSemanticVersion -q
73+
./gradlew --no-configuration-cache incrementSemanticVersionPatch
74+
./gradlew --no-configuration-cache printSemanticVersion -q
7575
7676
- name: Commit next version to main
7777
run: |

‎.github/workflows/publish-workflow.yml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,21 @@ jobs:
2929
remove-haskell: true
3030

3131
- name: Fetch Sources
32-
uses: actions/checkout@v3
32+
uses: actions/checkout@v4
3333
with:
3434
ref: ${{ inputs.tag-name }}
3535

3636
- name: Setup Java
37-
uses: actions/setup-java@v3
37+
uses: actions/setup-java@v4
3838
with:
3939
java-version: '17'
4040
distribution: 'corretto'
4141

4242
- name: Setup dotnet
43-
uses: actions/setup-dotnet@v2
43+
uses: actions/setup-dotnet@v4
4444
with:
4545
dotnet-version: |
46-
6.0.411
46+
8.0.301
4747
4848
## wrapper-validation-action fails too often with this error https://github.com/gradle/wrapper-validation-action/issues/40
4949
## we don't need it because we usually don't have contributors replacing it
@@ -70,19 +70,20 @@ jobs:
7070
env:
7171
CHANGELOG: ${{ steps.exportchangelog.outputs.changelog }}
7272
run: |
73-
./gradlew --no-configuration-cache -PbuildProfile=${{ inputs.build-profile }} -PdoNotDownloadSources=true patchChangelog --release-note="$CHANGELOG"
73+
./gradlew --no-configuration-cache -PbuildProfile=${{ inputs.build-profile }} patchChangelog --release-note="$CHANGELOG"
7474
7575
- name: Build plugin
7676
env:
7777
POSTHOG_TOKEN_URL: ${{ secrets.POSTHOG_TOKEN_URL }}
78-
run: ./gradlew buildPlugin --no-configuration-cache -PbuildProfile=${{ inputs.build-profile }} -PdoNotDownloadSources=true
78+
run: ./gradlew buildPlugin --no-configuration-cache -PbuildProfile=${{ inputs.build-profile }} -PbuildSearchableOptions=true
7979

8080
- name: Find posthog url
8181
id: posthog
8282
shell: bash
8383
run: |
84+
IJ_RELEASE_NUMBER=$(echo "${{ inputs.build-profile }}"|cut -c 2-)
8485
cd ${{ github.workspace }}/build/libs
85-
FILENAME=`ls instrumented-digma-intellij-plugin*.jar`
86+
FILENAME=`ls digma-intellij-plugin-${{ steps.exportversion.outputs.version }}+$IJ_RELEASE_NUMBER.jar`
8687
unzip -q "$FILENAME" -d content
8788
URL=$(cat ./content/posthog-token-url.txt)
8889
echo "url=${URL}" >> "$GITHUB_OUTPUT"
@@ -93,7 +94,7 @@ jobs:
9394

9495
- name: Verify posthog url exists
9596
if: ${{ steps.posthog.outputs.url == '' }}
96-
uses: actions/github-script@v3
97+
uses: actions/github-script@v7
9798
with:
9899
script: |
99100
core.setFailed('posthog url is empty')
@@ -107,7 +108,7 @@ jobs:
107108
DIGMA_JB_CERTIFICATE_CHAIN_FILE: ${{ secrets.DIGMA_JB_CERTIFICATE_CHAIN_FILE }}
108109
DIGMA_JB_PRIVATE_KEY_FILE: ${{ secrets.DIGMA_JB_PRIVATE_KEY_FILE }}
109110
POSTHOG_TOKEN_URL: ${{ secrets.POSTHOG_TOKEN_URL }}
110-
run: ./gradlew publishPlugin --no-configuration-cache -PbuildProfile=${{ inputs.build-profile }} -PdoNotDownloadSources=true
111+
run: ./gradlew publishPlugin --no-configuration-cache -PbuildProfile=${{ inputs.build-profile }} -PbuildSearchableOptions=true
111112

112113

113114
# todo: delete the release if workflow fails, but what about rerun ? maybe disable rerun for publish workflow

‎.github/workflows/release-draft.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212

1313
- name: Fetch Sources
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515
with:
1616
ref: 'main'
1717
fetch-depth: 1

‎.github/workflows/run-ui-tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ jobs:
2727
- os: windows-latest
2828
runIde: start gradlew.bat runIdeForUiTests
2929
- os: macos-latest
30-
runIde: ./gradlew -PdoNotDownloadSources=true runIdeForUiTests &
30+
runIde: ./gradlew runIdeForUiTests &
3131

3232
steps:
3333

3434
# Check out current repository
3535
- name: Fetch Sources
36-
uses: actions/checkout@v2.4.0
36+
uses: actions/checkout@v4
3737

3838
# Setup Java 11 environment for the next steps
3939
- name: Setup Java
40-
uses: actions/setup-java@v2
40+
uses: actions/setup-java@v4
4141
with:
4242
distribution: zulu
4343
java-version: 17
@@ -57,4 +57,4 @@ jobs:
5757

5858
# Run tests
5959
- name: Tests
60-
run: ./gradlew -PdoNotDownloadSources=true test
60+
run: ./gradlew test

‎.gitignore‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ out/
4545
*.iml
4646
*.ipr
4747
*.iws
48-
48+
## keep .idea/codeStyles/ in git so it is shared
49+
!.idea/codeStyles/*
4950
##############################
5051
## Eclipse
5152
##############################
@@ -90,3 +91,13 @@ nb-configuration.xml
9091
## Qodana
9192
##############################
9293
.qodana
94+
95+
96+
#############################
97+
## intellij platform gradle plugin
98+
#############################
99+
.intellijPlatform
100+
101+
102+
## dotnet binlog
103+
msbuild.log

0 commit comments

Comments
 (0)