Skip to content

Commit 66698bc

Browse files
shalom938shalom938
authored
Merge pull request #2517 from digma-ai/start-eap-2024.3
support 2024.3 EAP
2 parents df8cb40 + 76baccc commit 66698bc

File tree

27 files changed

+158
-70
lines changed

27 files changed

+158
-70
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: [ p231, p232, p233, p241, p242 ]
12+
profile: [ p231, p232, p233, p241, p242, p243 ]
1313
uses: ./.github/workflows/build-workflow.yml
1414
with:
1515
build-profile: ${{ matrix.profile }}
@@ -19,7 +19,7 @@ jobs:
1919
build-workflow-with-rider:
2020
strategy:
2121
matrix:
22-
profile: [ p231, p232, p233, p241, p242 ]
22+
profile: [ p231, p232, p233, p241, p242, p243 ]
2323
uses: ./.github/workflows/build-workflow.yml
2424
with:
2525
build-profile: ${{ matrix.profile }}

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

Lines changed: 3 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: [ p231, p232, p233, p241, p242 ]
10+
profile: [ p231, p232, p233, p241, p242, p243 ]
1111
uses: ./.github/workflows/build-workflow.yml
1212
with:
1313
build-profile: ${{ matrix.profile }}
@@ -18,7 +18,7 @@ jobs:
1818
build-workflow-with-rider:
1919
strategy:
2020
matrix:
21-
profile: [ p231, p232, p233, p241, p242 ]
21+
profile: [ p231, p232, p233, p241, p242, p243 ]
2222
uses: ./.github/workflows/build-workflow.yml
2323
with:
2424
build-profile: ${{ matrix.profile }}
@@ -29,7 +29,7 @@ jobs:
2929
plugin-verifier-workflow:
3030
strategy:
3131
matrix:
32-
profile: [ p231, p232, p233, p241, p242 ]
32+
profile: [ p231, p232, p233, p241, p242, p243 ]
3333
uses: ./.github/workflows/plugin-verifier-workflow.yml
3434
with:
3535
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: [ p231, p232, p233, p241, p242 ]
11+
profile: [ p231, p232, p233, p241, p242, p243 ]
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: [ p231, p232, p233, p241, p242 ]
22+
profile: [ p231, p232, p233, p241, p242, p243 ]
2323
uses: ./.github/workflows/build-workflow.yml
2424
with:
2525
build-profile: ${{ matrix.profile }}
@@ -30,7 +30,7 @@ jobs:
3030
plugin-verifier-workflow:
3131
strategy:
3232
matrix:
33-
profile: [ p231, p232, p233, p241, p242 ]
33+
profile: [ p231, p232, p233, p241, p242, p243 ]
3434
uses: ./.github/workflows/plugin-verifier-workflow.yml
3535
with:
3636
build-profile: ${{ matrix.profile }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ jobs:
5252

5353
- name: Build Plugin
5454
if: ${{ inputs.build-with-rider != 'true' }}
55-
run: ./gradlew clean test buildPlugin --no-configuration-cache -PbuildProfile=${{ inputs.build-profile }} -PbuildSearchableOptions=true
55+
run: ./gradlew clean test buildPlugin --no-daemon --no-configuration-cache -PbuildProfile=${{ inputs.build-profile }} -PbuildSearchableOptions=true
5656

5757
- name: Build Plugin with Rider
5858
if: ${{ inputs.build-with-rider == 'true' }}
59-
run: ./gradlew clean test buildPlugin --no-configuration-cache -PbuildWithRider=true -PbuildProfile=${{ inputs.build-profile }} -PbuildSearchableOptions=true
59+
run: ./gradlew clean test buildPlugin --no-daemon --no-configuration-cache -PbuildWithRider=true -PbuildProfile=${{ inputs.build-profile }} -PbuildSearchableOptions=true
6060

6161
- name: Prepare Plugin Artifact
6262
if: ${{ inputs.build-with-rider != 'true' }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747

4848
- name: Run Plugin Verifier
49-
run: ./gradlew buildPlugin verifyPlugin -PbuildProfile=${{ inputs.build-profile }}
49+
run: ./gradlew buildPlugin verifyPlugin --no-daemon -PbuildProfile=${{ inputs.build-profile }}
5050

5151
- name: Collect Plugin Verifier Result
5252
if: ${{ inputs.build-with-rider != 'true' }}

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

Lines changed: 5 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: [ p231, p232, p233, p241, p242 ]
16+
profile: [ p231, p232, p233, p241, p242, p243 ]
1717
uses: ./.github/workflows/publish-workflow.yml
1818
with:
1919
build-profile: ${{ matrix.profile }}
@@ -34,10 +34,7 @@ jobs:
3434
token: ${{ secrets.GH_ADMIN_TOKEN }}
3535

3636
- name: Setup Java
37-
uses: actions/setup-java@v4
38-
with:
39-
java-version: '17'
40-
distribution: 'corretto'
37+
uses: ./github-actions/java-setup
4138

4239
- name: Setup dotnet
4340
uses: actions/setup-dotnet@v4
@@ -65,13 +62,13 @@ jobs:
6562
env:
6663
CHANGELOG: ${{ steps.exportchangelog.outputs.changelog }}
6764
run: |
68-
./gradlew --no-configuration-cache patchChangelog --release-note="$CHANGELOG"
65+
./gradlew --no-daemon --no-configuration-cache patchChangelog --release-note="$CHANGELOG"
6966
7067
7168
- name: Increment version
7269
run: |
73-
./gradlew --no-configuration-cache incrementSemanticVersionPatch
74-
./gradlew --no-configuration-cache printSemanticVersion -q
70+
./gradlew --no-daemon --no-configuration-cache incrementSemanticVersionPatch
71+
./gradlew --no-daemon --no-configuration-cache printSemanticVersion -q
7572
7673
7774

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ jobs:
6868
env:
6969
CHANGELOG: ${{ steps.exportchangelog.outputs.changelog }}
7070
run: |
71-
./gradlew --no-configuration-cache -PbuildProfile=${{ inputs.build-profile }} patchChangelog --release-note="$CHANGELOG"
71+
./gradlew --no-daemon --no-configuration-cache -PbuildProfile=${{ inputs.build-profile }} patchChangelog --release-note="$CHANGELOG"
7272
7373
- name: Build plugin
74-
run: ./gradlew test buildPlugin --no-configuration-cache -PbuildProfile=${{ inputs.build-profile }} -PbuildSearchableOptions=true
74+
run: ./gradlew test buildPlugin --no-daemon --no-configuration-cache -PbuildProfile=${{ inputs.build-profile }} -PbuildSearchableOptions=true
7575

7676

7777
# Publish the plugin to the Marketplace
@@ -81,7 +81,7 @@ jobs:
8181
DIGMA_JB_PRIVATE_KEY_PASSWORD: ${{ secrets.DIGMA_JB_PRIVATE_KEY_PASSWORD }}
8282
DIGMA_JB_CERTIFICATE_CHAIN_FILE: ${{ secrets.DIGMA_JB_CERTIFICATE_CHAIN_FILE }}
8383
DIGMA_JB_PRIVATE_KEY_FILE: ${{ secrets.DIGMA_JB_PRIVATE_KEY_FILE }}
84-
run: ./gradlew publishPlugin --no-configuration-cache -PbuildProfile=${{ inputs.build-profile }} -PbuildSearchableOptions=true
84+
run: ./gradlew publishPlugin --no-daemon --no-configuration-cache -PbuildProfile=${{ inputs.build-profile }} -PbuildSearchableOptions=true
8585

8686

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

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- os: windows-latest
2828
runIde: start gradlew.bat runIdeForUiTests
2929
- os: macos-latest
30-
runIde: ./gradlew runIdeForUiTests &
30+
runIde: ./gradlew --no-daemon runIdeForUiTests &
3131

3232
steps:
3333

@@ -37,11 +37,7 @@ jobs:
3737

3838
# Setup Java 11 environment for the next steps
3939
- name: Setup Java
40-
uses: actions/setup-java@v4
41-
with:
42-
distribution: zulu
43-
java-version: 17
44-
cache: gradle
40+
uses: ./github-actions/java-setup
4541

4642
# Run IDEA prepared for UI testing
4743
- name: Run IDE
@@ -57,4 +53,4 @@ jobs:
5753

5854
# Run tests
5955
- name: Tests
60-
run: ./gradlew test
56+
run: ./gradlew --no-daemon test

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,6 @@ nb-configuration.xml
100100

101101

102102
## dotnet binlog
103-
msbuild.log
103+
msbuild.log
104+
105+
/.kotlin

‎analytics-provider/build.gradle.kts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
plugins {
44
id("common-java-library")
5+
//although this module doesn't have kotlin classes it needs to be common-kotlin because it uses classes from model which
6+
// are all kotlin data classes. tests in this module use jackson serialization, with kotlin 2 jackson fails to find classes
7+
// that are probably part of the kotlin generated bytecode. So making this module also common-kotlin solves this issue.
8+
id("common-kotlin")
59
id("jvm-test-suite")
610
}
711

0 commit comments

Comments
 (0)