Merge pull request #114 from martinszuc/issue-889

Issue 889
martinszuc · Oct 1, 2024 · 085fd3e · 085fd3e
2 parents a71743b + de09a6c
commit 085fd3e
Show file tree

Hide file tree

Showing 27 changed files with 696 additions and 555 deletions.
diff --git a/.github/workflows/IJ-latest.yml b/.github/workflows/IJ-latest.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
-        run: ./gradlew build --continue -PideaVersion=IU-LATEST-EAP-SNAPSHOT
+        run: ./gradlew build --continue -PplatformVersion=LATEST-EAP-SNAPSHOT
       - uses: actions/upload-artifact@v4
         if: always()
         with:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
-        run: ./gradlew build --continue --no-daemon
+        run: ./gradlew build --continue
       - uses: actions/upload-artifact@v4
         if: always()
         with:
@@ -91,7 +91,7 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Play integration tests
-        run: ./gradlew integrationTest --continue --no-daemon
+        run: ./gradlew integrationTest --continue
       - uses: actions/upload-artifact@v4
         if: always()
         with:

diff --git a/.github/workflows/cluster_integration_ui_tests.yml b/.github/workflows/cluster_integration_ui_tests.yml
@@ -1,13 +1,15 @@
-name: Cluster Integration UI Tests
+name: Integration UI Tests with Local Kind Cluster Context
 on:
   workflow_run:
     workflows: [ "Java CI with Gradle" ]
     types:
       - completed
 jobs:
-  kubernetes-integration-ui-tests:
+  cluster-integration-ui-tests:
     runs-on: ubuntu-latest
     steps:
+      - name: Create more disk space
+        run: sudo rm -rf /usr/share/dotnet && sudo rm -rf /opt/ghc && sudo rm -rf "/usr/local/share/boost" && sudo rm -rf "$AGENT_TOOLSDIRECTORY"
       - uses: actions/checkout@v4
       - name: Set up JDK 17
         uses: actions/setup-java@v4
@@ -36,18 +38,28 @@ jobs:
             sleep 1
             nb=`kubectl get pods -n operators --no-headers --ignore-not-found | grep Running | wc -l`
           done
+          # TODO remove locally building common-ui-test-library after new release of common-ui-test-library
+      - name: 'Clone common-ui-test-library to Maven Local repository'
+        run: |
+          git clone --branch ghabranch https://github.com/martinszuc/intellij-common-ui-test-library.git ../common-ui-test-library
+      - uses: burrunan/gradle-cache-action@3bf23b8dd95e7d2bacf2470132454fe893a178a1 #v1
+        name: Build common-ui-test-library
+        with:
+          build-root-directory: ../common-ui-test-library
+          arguments: publishToMavenLocal
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Play cluster integration UI tests
         env:
           GPG_PASSPHRASE: ${{ secrets.IDEA_KEY_PASSPHRASE }}
           CLUSTER_ALREADY_LOGGED_IN: 'true'
+          RUN_CLUSTER_TESTS: 'true'
         run: |
           echo -n "$GPG_PASSPHRASE" | gpg --decrypt --passphrase-fd 0 --pinentry-mode loopback --output idea_license_token/idea.key idea_license_token/idea.key.gpg
           export DISPLAY=:99.0
           Xvfb -ac :99 -screen 0 1920x1080x16 &
           sleep 10
-          ./gradlew clusterIntegrationUITest --continue --no-daemon --info
+          ./gradlew integrationUITest --continue --no-daemon --info
       - name: Publish tests reports
         if: always()
         uses: scacap/action-surefire-report@a2911bd1a4412ec18dde2d93b1758b3e56d2a880 #v1.8.0

diff --git a/...workflows/public_integration_ui_tests.yml → ...flows/no_context_integration_ui_tests.yml b/...workflows/public_integration_ui_tests.yml → ...flows/no_context_integration_ui_tests.yml
@@ -1,13 +1,15 @@
-name: Public Integration UI Tests
+name: Integration UI Tests with No Context
 on:
   workflow_run:
     workflows: [ "Java CI with Gradle" ]
     types:
       - completed
 jobs:
-  public-integration-ui-tests:
+  no-context-integration-ui-tests:
     runs-on: ubuntu-latest
     steps:
+      - name: Create more disk space
+        run: sudo rm -rf /usr/share/dotnet && sudo rm -rf /opt/ghc && sudo rm -rf "/usr/local/share/boost" && sudo rm -rf "$AGENT_TOOLSDIRECTORY"
       - uses: actions/checkout@v4
       - name: Set up JDK 17
         uses: actions/setup-java@v4
@@ -21,25 +23,34 @@ jobs:
           add-job-summary: 'on-failure'
           add-job-summary-as-pr-comment: 'on-failure'
           validate-wrappers: true
+      # TODO remove locally building common-ui-test-library after new release of common-ui-test-library
+      - name: 'Clone common-ui-test-library to Maven Local repository'
+        run: |
+          git clone --branch ghabranch https://github.com/martinszuc/intellij-common-ui-test-library.git ../common-ui-test-library
+      - uses: burrunan/gradle-cache-action@3bf23b8dd95e7d2bacf2470132454fe893a178a1 #v1
+        name: Build common-ui-test-library
+        with:
+          build-root-directory: ../common-ui-test-library
+          arguments: publishToMavenLocal
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
-      - name: Play public integration UI tests
+      - name: Play integration UI tests
         env:
           GPG_PASSPHRASE: ${{ secrets.IDEA_KEY_PASSPHRASE }}
         run: |
           echo -n "$GPG_PASSPHRASE" | gpg --decrypt --passphrase-fd 0 --pinentry-mode loopback --output idea_license_token/idea.key idea_license_token/idea.key.gpg
           export DISPLAY=:99.0
           Xvfb -ac :99 -screen 0 1920x1080x16 &
           sleep 10
-          ./gradlew publicIntegrationUITest --continue --no-daemon
+          ./gradlew integrationUITest --continue --no-daemon --info
       - name: Publish tests reports
         if: always()
         uses: scacap/action-surefire-report@a2911bd1a4412ec18dde2d93b1758b3e56d2a880 #v1.8.0
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           report_paths: '${{github.workspace}}/build/test-results/**/TEST-*.xml'
           commit: ${{github.event.workflow_run.head_sha}}
-          check_name: Public Integration UI Tests Report
+          check_name: Integration UI Tests with No Context Report
       - name: Publish screenshots as artifacts
         if: failure()
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/validate_IJ_versions.yml b/.github/workflows/validate_IJ_versions.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        IJ: [ IU-2022.3, IU-2023.1, IU-2023.2, IU-2023.3, IU-2024.1 ]
+        IJ: [ 2022.3, 2023.1, 2023.2, 2023.3, 2024.1, 2024.2 ]
 
     steps:
     - name: Checkout Code
@@ -23,12 +23,13 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
-      run: ./gradlew build -PideaVersion=${{ matrix.IJ }}
+      run: ./gradlew build -PplatformVersion=${{ matrix.IJ }}
     - name: Verify with Gradle
-      run: ./gradlew runPluginVerifier -PideaVersion=${{ matrix.IJ }}
+      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
+        if-no-files-found: ignore
diff --git a/Jenkinsfile b/Jenkinsfile