Skip to content

Commit 1033840

Browse files
committed
chore: migrate build to 2024.2
bumping minimal version to 2023.1 updated commons to 1.9.7-snapshot and use workaround provided by @AlexanderBartash removed @NonNls which caused errors in IC-2023.2 Signed-off-by: Andre Dietisheim <[email protected]>
1 parent adc3742 commit 1033840

34 files changed

+355
-484
lines changed

.github/workflows/IJ-latest.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ jobs:
2323
- name: Grant execute permission for gradlew
2424
run: chmod +x gradlew
2525
- name: Build with Gradle
26-
run: ./gradlew build --continue -PideaVersion=LATEST-EAP-SNAPSHOT
26+
run: |
27+
LATEST_EAP_SNAPSHOT=$(./gradlew printProductsReleases | grep 'IC-' | head -n 1 | cut -d'-' -f2)
28+
./gradlew build --continue -PplatformVersion=$LATEST_EAP_SNAPSHOT
2729
- uses: actions/upload-artifact@v4
2830
if: always()
2931
with:

.github/workflows/IJ.yml

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
strategy:
1616
matrix:
17-
IJ: [IC-2022.3, IC-2023.1, IC-2023.2, IC-2023.3, IC-2024.1]
17+
IJ: [2023.1, 2023.2, 2023.3, 2024.1, 2024.2]
1818

1919
steps:
2020
- uses: actions/checkout@v4
@@ -27,27 +27,12 @@ jobs:
2727
- name: Grant execute permission for gradlew
2828
run: chmod +x gradlew
2929
- name: Build with Gradle
30-
run: ./gradlew build -PideaVersion=${{ matrix.IJ }}
31-
32-
verify:
33-
runs-on: ubuntu-latest
34-
35-
steps:
36-
- name: Checkout Code
37-
uses: actions/checkout@v4
38-
- name: Set up JDK 17
39-
uses: actions/setup-java@v4
40-
with:
41-
java-version: 17
42-
distribution: 'temurin'
43-
cache: 'gradle'
44-
- name: Grant execute permission for gradlew
45-
run: chmod +x gradlew
46-
- name: Build with Gradle
47-
run: ./gradlew runPluginVerifier -PideaVersion=IC-2023.2
48-
- name: Upload report
49-
uses: actions/upload-artifact@v4
50-
if: always()
51-
with:
52-
name: verifier-report
53-
path: build/reports/pluginVerifier
30+
run: ./gradlew build -PplatformVersion=${{ matrix.IJ }}
31+
- name: Validate with Gradle
32+
run: ./gradlew verifyPlugin -PplatformVersion=${{ matrix.IJ }}
33+
- name: Upload report
34+
uses: actions/upload-artifact@v4
35+
if: always()
36+
with:
37+
name: ${{ matrix.IJ }}-verifier-report
38+
path: build/reports/pluginVerifier

.github/workflows/accepted

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/it.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,9 @@ jobs:
3434
make run-local
3535
- name: Run integration tests
3636
run: |
37-
dir=~/.java/.userPrefs/jetbrains/_\!\(\!\!cg\"p\!\(\}\!\}@\"j\!\(k\!\|w\"w\!\'8\!b\!\"p\!\':\!e@=\=
38-
mkdir -p "$dir"
39-
cp .github/workflows/prefs.xml $dir
40-
mkdir -p ~/.local/share/JetBrains/consentOptions
41-
cp .github/workflows/accepted ~/.local/share/JetBrains/consentOptions
4237
export DISPLAY=:99.0
4338
Xvfb -ac :99 -screen 0 1920x1080x16 &
39+
sleep 10
4440
./gradlew integrationTest --info
4541
- uses: actions/upload-artifact@v4
4642
with:

.github/workflows/prefs.xml

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
current-tag: ${{ inputs.release_version }}
112112
types-mapping: 'feat:Features,fix:Bug Fixes,docs:Documentation,refactor:Refactoring,build:Builds,chore:Other'
113113

114-
# Create a new Github release
114+
# Create a new GitHub release
115115
- name: Create Github Release
116116
env:
117117
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -128,4 +128,3 @@ jobs:
128128
env:
129129
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
130130
run: gh release upload ${{ inputs.release_version }} ./build/distributions/*
131-

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ build
55
.gradle
66
out
77

8+
/.intellijPlatform/

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
node('rhel7'){
44
def recipientList = '[email protected]'
5-
def javaHome = tool 'openjdk-11'
5+
def javaHome = tool 'openjdk-17'
66
env.JAVA_HOME = "${javaHome}"
77

88
try {

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
###########################################
2-
# Intellij-kubernets run build minikube #
3-
###########################################
1+
############################################
2+
# Intellij-kubernetes run build minikube #
3+
############################################
44

55
MOD_FLAGS := $(shell (go version | grep -q -E "1\.1[1-9]") && echo -mod=vendor)
66
CMDS := $(shell go list $(MOD_FLAGS) ./cmd/...)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ UI Testing
157157
==========
158158
You can perform UI testing by running the following command:
159159
```sh
160-
./gradlew clean runIdeForUiTests -PideaVersion=IC-2020.2 & ./gradlew integrationTest
160+
./gradlew integrationTest
161161
```
162162

163163
License

build.gradle

Lines changed: 0 additions & 233 deletions
This file was deleted.

0 commit comments

Comments
 (0)