Skip to content

Commit

Permalink
chore: migrate build to 2024.2
Browse files Browse the repository at this point in the history
* 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]>
Co-authored-by: @AlexanderBartash
  • Loading branch information
sbouchet authored and adietish committed Oct 25, 2024
1 parent c9af008 commit 9ee07fa
Show file tree
Hide file tree
Showing 34 changed files with 355 additions and 473 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/IJ-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ jobs:
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build --continue -PideaVersion=LATEST-EAP-SNAPSHOT
run: |
LATEST_EAP_SNAPSHOT=$(./gradlew printProductsReleases | grep 'IC-' | head -n 1 | cut -d'-' -f2)
./gradlew build --continue -PplatformVersion=$LATEST_EAP_SNAPSHOT
- uses: actions/upload-artifact@v4
if: always()
with:
Expand Down
35 changes: 10 additions & 25 deletions .github/workflows/IJ.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
IJ: [IC-2022.3, IC-2023.1, IC-2023.2, IC-2023.3, IC-2024.1]
IJ: [2023.1, 2023.2, 2023.3, 2024.1, 2024.2]

steps:
- uses: actions/checkout@v4
Expand All @@ -27,27 +27,12 @@ jobs:
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build -PideaVersion=${{ matrix.IJ }}

verify:
runs-on: ubuntu-latest

steps:
- name: Checkout Code
uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'temurin'
cache: 'gradle'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew runPluginVerifier -PideaVersion=IC-2023.2
- name: Upload report
uses: actions/upload-artifact@v4
if: always()
with:
name: verifier-report
path: build/reports/pluginVerifier
run: ./gradlew build -PplatformVersion=${{ matrix.IJ }}
- name: Validate with Gradle
run: ./gradlew verifyPlugin -PplatformVersion=${{ matrix.IJ }}
- name: Upload report
uses: actions/upload-artifact@v4
if: always()
with:
name: ${{ matrix.IJ }}-verifier-report
path: build/reports/pluginVerifier
1 change: 0 additions & 1 deletion .github/workflows/accepted

This file was deleted.

6 changes: 1 addition & 5 deletions .github/workflows/it.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,9 @@ jobs:
make run-local
- name: Run integration tests
run: |
dir=~/.java/.userPrefs/jetbrains/_\!\(\!\!cg\"p\!\(\}\!\}@\"j\!\(k\!\|w\"w\!\'8\!b\!\"p\!\':\!e@=\=
mkdir -p "$dir"
cp .github/workflows/prefs.xml $dir
mkdir -p ~/.local/share/JetBrains/consentOptions
cp .github/workflows/accepted ~/.local/share/JetBrains/consentOptions
export DISPLAY=:99.0
Xvfb -ac :99 -screen 0 1920x1080x16 &
sleep 10
./gradlew integrationTest --info
- uses: actions/upload-artifact@v4
with:
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/prefs.xml

This file was deleted.

3 changes: 1 addition & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:
current-tag: ${{ inputs.release_version }}
types-mapping: 'feat:Features,fix:Bug Fixes,docs:Documentation,refactor:Refactoring,build:Builds,chore:Other'

# Create a new Github release
# Create a new GitHub release
- name: Create Github Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -128,4 +128,3 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: gh release upload ${{ inputs.release_version }} ./build/distributions/*

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ build
.gradle
out

/.intellijPlatform/
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

try {
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
###########################################
# Intellij-kubernets run build minikube #
###########################################
############################################
# Intellij-kubernetes run build minikube #
############################################

MOD_FLAGS := $(shell (go version | grep -q -E "1\.1[1-9]") && echo -mod=vendor)
CMDS := $(shell go list $(MOD_FLAGS) ./cmd/...)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ UI Testing
==========
You can perform UI testing by running the following command:
```sh
./gradlew clean runIdeForUiTests -PideaVersion=IC-2020.2 & ./gradlew integrationTest
./gradlew integrationTest
```

License
Expand Down
222 changes: 0 additions & 222 deletions build.gradle

This file was deleted.

Loading

0 comments on commit 9ee07fa

Please sign in to comment.