From ef8392044648434678633509aaa7e59e160974dc Mon Sep 17 00:00:00 2001 From: Nick Rayburn <52075362+nrayburn-tech@users.noreply.github.com> Date: Wed, 9 Oct 2024 00:01:27 -0500 Subject: [PATCH 1/3] Change plugin dependencies to support all IDEs with the JavaScript plugin --- gradle.properties | 2 +- src/main/resources/META-INF/plugin.xml | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index ec90ce7..45577e9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ platformVersion = 2023.3.2 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 platformPlugins = # Example: platformBundledPlugins = com.intellij.java -platformBundledPlugins = +platformBundledPlugins = JavaScript # Gradle Releases -> https://github.com/gradle/gradle/releases gradleVersion = 8.10.2 diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 2ccc6ed..989fa77 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -4,12 +4,11 @@ Oxc iwanabethatguy - com.intellij.modules.ultimate - + com.intellij.modules.platform + JavaScript messages.MyBundle - From 581daa078e6852132011d0f8194f61bf424d9da5 Mon Sep 17 00:00:00 2001 From: Nick Rayburn <52075362+nrayburn-tech@users.noreply.github.com> Date: Wed, 9 Oct 2024 01:14:14 -0500 Subject: [PATCH 2/3] Update build to run verification against IntelliJ Ultimate and Webstorm --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ef4e836..64433a7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -176,6 +176,9 @@ jobs: name: Verify plugin needs: [ build ] runs-on: ubuntu-latest + strategy: + matrix: + platformType: ['IU', 'WS'] steps: # Free GitHub Actions Environment Disk Space @@ -209,7 +212,7 @@ jobs: # Run Verify Plugin task and IntelliJ Plugin Verifier tool - name: Run Plugin Verification tasks - run: ./gradlew verifyPlugin -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }} + run: ./gradlew verifyPlugin -PplatformType=${{ matrix.platformType }} -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }} # Collect Plugin Verifier Result - name: Collect Plugin Verifier Result From 9717cd5f638f8b2d5f9b547c0ddca92e884d8e90 Mon Sep 17 00:00:00 2001 From: Nick Rayburn <52075362+nrayburn-tech@users.noreply.github.com> Date: Wed, 9 Oct 2024 02:36:45 -0500 Subject: [PATCH 3/3] Fix the verify step to have unique file names when uploading verification reports --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 64433a7..e463942 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -219,7 +219,7 @@ jobs: if: ${{ always() }} uses: actions/upload-artifact@v4 with: - name: pluginVerifier-result + name: pluginVerifier-result-${{ matrix.platformType }} path: ${{ github.workspace }}/build/reports/pluginVerifier # Prepare a draft release for GitHub Releases page for the manual verification